diff options
-rw-r--r-- | kernels/linux-libre-lts-rt/.directory | 6 | ||||
-rw-r--r-- | kernels/linux-libre-lts-rt/PKGBUILD | 32 | ||||
-rw-r--r-- | kernels/linux-libre-lts-rt/config.i686 | 3 | ||||
-rw-r--r-- | kernels/linux-libre-lts-rt/config.x86_64 | 3 | ||||
-rw-r--r-- | kernels/linux-libre-lts-rt/linux-libre-lts-rt.install | 2 | ||||
-rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 24 | ||||
-rw-r--r-- | kernels/linux-libre-rt/linux-libre-rt.install | 2 | ||||
-rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 3 | ||||
-rw-r--r-- | libre/vhba-module-libre/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/vhba-module-libre/vhba-module.install | 2 |
10 files changed, 42 insertions, 37 deletions
diff --git a/kernels/linux-libre-lts-rt/.directory b/kernels/linux-libre-lts-rt/.directory new file mode 100644 index 000000000..7a883fed9 --- /dev/null +++ b/kernels/linux-libre-lts-rt/.directory @@ -0,0 +1,6 @@ +[Dolphin] +Timestamp=2012,8,9,23,59,18 +Version=3 + +[Settings] +HiddenFilesShown=true diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index aee3a19ed..91948da14 100644 --- a/kernels/linux-libre-lts-rt/PKGBUILD +++ b/kernels/linux-libre-lts-rt/PKGBUILD @@ -13,11 +13,11 @@ pkgname=('linux-libre-lts-rt' 'linux-libre-lts-rt-headers') # Build stock -LIBRE # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS-RT _basekernel=3.0 -_releasever=36 -_rtpatchver=rt57 +_releasever=39 +_rtpatchver=rt59 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -_lxopkgver=${_basekernel}.36 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.39 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -39,10 +39,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '150413437fe54d4822e9e43189e37319' - '52679525b6b1049f5d54f270fad43423' - '37c2f6a089bc5d7632bcea4510c73e59' - 'ffbd1f905ffb0bc0eccbbd729de7d116' + '9259948f76db87052be56da4c525d07a' + '637deb8769ed9c0cb99ba2c8041a1d4b' + '7266f5e7af09cc6e4b15d7a952e3b350' + '5387f0cf51652c071190789569adf9c7' '85f04a9555bdc295f7c387a6564f0c81' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -50,7 +50,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'c8299cf750a84e12d60b372c8ca7e1e8' - '7102cdd847f0bd7102f0ad01fa43f454') + 'eea9aa0065f636fc924a23b3ffd24343') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -154,12 +154,12 @@ build() { } package_linux-libre-lts-rt() { - pkgdesc="The Linux-libre Kernel and modules (with full realtime preemption) - stable longtime supported kernel package suitable for servers" + pkgdesc="The Linux-libre Kernel and modules with full realtime preemption - stable longtime supported kernel package suitable for servers" depends=('coreutils' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') - provides=('kernel26-rt-lts' "linux-rt-lts=$_pkgver") - conflicts=('kernel26-rt-lts' 'kernel26-libre-lts-rt' 'linux-rt-lts') - replaces=('kernel26-rt-lts' 'kernel26-libre-lts-rt' 'linux-rt-lts') + provides=("linux-rt-lts=$pkgver") + conflicts=('linux-rt-lts') + replaces=('linux-rt-lts') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install if [ "$CARCH" = "mips64el" ]; then @@ -226,10 +226,10 @@ package_linux-libre-lts-rt() { } package_linux-libre-lts-rt-headers() { - pkgdesc="Header files and scripts for building modules for linux-libre-lts longtime supported kernel (with realtime preemption)" - provides=('kernel26-rt-lts-headers' "linux-rt-lts-headers=${_pkgver}") - conflicts=('kernel26-rt-lts-headers' 'kernel26-libre-lts-rt-headers' 'linux-rt-lts-headers') - replaces=('kernel26-rt-lts-headers' 'kernel26-libre-lts-rt-headers' 'linux-rt-lts-headers') + pkgdesc="Header files and scripts for building modules for linux-libre-lts longtime supported kernel with realtime preemption" + provides=("linux-rt-lts-headers=${pkgver}") + conflicts=('linux-rt-lts-headers') + replaces=('linux-rt-lts-headers') KARCH=x86 [ $CARCH = "mips64el" ] && KARCH=mips diff --git a/kernels/linux-libre-lts-rt/config.i686 b/kernels/linux-libre-lts-rt/config.i686 index a7a870b8a..39bc1c678 100644 --- a/kernels/linux-libre-lts-rt/config.i686 +++ b/kernels/linux-libre-lts-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.36-1 Kernel Configuration +# Linux/i386 3.0.39-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -132,7 +132,6 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set CONFIG_NAMESPACES=y diff --git a/kernels/linux-libre-lts-rt/config.x86_64 b/kernels/linux-libre-lts-rt/config.x86_64 index 6f3957bb7..826a006b2 100644 --- a/kernels/linux-libre-lts-rt/config.x86_64 +++ b/kernels/linux-libre-lts-rt/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.36-1 Kernel Configuration +# Linux/x86_64 3.0.39-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -133,7 +133,6 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set CONFIG_NAMESPACES=y diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install index ffd8c1c66..84b7a0084 100644 --- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install +++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-rt -KERNEL_VERSION=3.0.36-1-rt57-LIBRE-LTS-RT +KERNEL_VERSION=3.0.39-1-rt59-LIBRE-LTS-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 40746f814..1a247b16b 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -13,12 +13,12 @@ pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-RT _basekernel=3.4 -_releasever=4 -_rtpatchver=rt13 +_releasever=7 +_rtpatchver=rt15 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver -pkgrel=1.1 +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -154,12 +154,12 @@ build() { } package_linux-libre-rt() { - pkgdesc="The Linux-libre Kernel and modules (with realtime preemption)" + pkgdesc="The Linux-libre Kernel and modules with realtime preemption" depends=('coreutils' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') - provides=('kernel26-rt' "linux-rt=$_pkgver") - conflicts=('kernel26-rt' 'kernel26-libre-rt' 'linux-rt') - replaces=('kernel26-rt' 'kernel26-libre-rt' 'linux-rt') + provides=('kernel26rt' "linux-rt=$pkgver") + conflicts=('kernel26rt' 'linux-rt') + replaces=('kernel26rt' 'linux-rt') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install if [ "$CARCH" = "mips64el" ]; then @@ -226,10 +226,10 @@ package_linux-libre-rt() { } package_linux-libre-rt-headers() { - pkgdesc="Header files and scripts for building modules for linux-libre kernel (with realtime preemption)" - provides=('kernel26-rt-headers' "linux-rt-headers=${_pkgver}") - conflicts=('kernel26-rt-headers' 'kernel26-libre-rt-headers' 'linux-rt-headers') - replaces=('kernel26-rt-headers' 'kernel26-libre-rt-headers' 'linux-rt-headers') + pkgdesc="Header files and scripts for building modules for linux-libre kernel with realtime preemption" + provides=('kernel26rt-headers' "linux-rt-headers=${pkgver}") + conflicts=('kernel26rt-headers' 'linux-rt-headers') + replaces=('kernel26rt-headers' 'linux-rt-headers') KARCH=x86 [ $CARCH = "mips64el" ] && KARCH=mips diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 7d448d7c6..8afaabeed 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.4.4-1.1-rt13-LIBRE-RT +KERNEL_VERSION=3.4.7-1-rt15-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 2f20a872e..27fb5d504 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -21,7 +21,7 @@ provides=("kdelibs=$pkgver") replaces=('kdelibs') conflicts=('kdelibs') install=${_pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' 'khtml-fsdg.diff') @@ -29,6 +29,7 @@ sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' 'a1502a964081ad583a00cf90c56e74bf60121830') + build() { cd "${srcdir}"/${_pkgname}-${pkgver} diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 2de64bc38..9b86cc51e 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.5-LIBRE -pkgrel=6 +pkgrel=7 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install index ac27991cc..b2a49a261 100644 --- a/libre/vhba-module-libre/vhba-module.install +++ b/libre/vhba-module-libre/vhba-module.install @@ -9,7 +9,7 @@ post_install() { } post_upgrade() { - getent group cdemu &>/dev/null || groupadd cdemu + getent group cdemu &>/dev/null || groupadd -r cdemu _updatemod } |