Merge branch 'master' of ssh://gparabola/srv/git/abslibre

4 files changed, 24 insertions, 24 deletions

diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD
index 33ebb0965..daf2d1c16 100755
--- a/kernels/linux-libre-lts-rt/PKGBUILD
+++ b/kernels/linux-libre-lts-rt/PKGBUILD
@@ -11,12 +11,12 @@
 pkgbase=linux-libre-lts-rt  # Build stock -LIBRE-LTS-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_releasever=41
-_rtpatchver=rt61
+_releasever=43
+_rtpatchver=rt65
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.43 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -37,8 +37,8 @@ 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/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'b4ebaa2ebf8418c75aba96fd4dd6daf3'
-         '11bb95e505726abd1e1adfa522ef178f'
+         'c4b4e6d908e70fc6f991a1789a3ac620'
+         'bcca49907b1c1e74f6ff6afced5ff959'
          '7266f5e7af09cc6e4b15d7a952e3b350'
          '5387f0cf51652c071190789569adf9c7'
          '85f04a9555bdc295f7c387a6564f0c81'
@@ -48,7 +48,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'c8299cf750a84e12d60b372c8ca7e1e8'
-         '1f082cc9e5a18e227f7a044ff429914a')
+         '2c4870ef22f87ef885f3be392d1aaa90')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -236,11 +236,11 @@ _package() {
   mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}"
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}/version"
 
-  # move module tree /lib -> /usr/lib
-  mv "$pkgdir/lib" "$pkgdir/usr"
-
   # Now we call depmod...
   depmod -b "$pkgdir" -F System.map "$_kernver"
+
+  # move module tree /lib -> /usr/lib
+  mv "$pkgdir/lib" "$pkgdir/usr"
 }
 
 _package-headers() {
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 7f7e3a11f..d2f0ae05a 100755
--- 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.41-1-rt61-LIBRE-LTS-RT
+KERNEL_VERSION=3.0.43-1-rt65-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'
@@ -33,7 +33,7 @@ post_install () {
 post_upgrade() {
   pacman -Q grub &>/dev/null
   hasgrub=$?
-  pacman -Q grub2-common &>/dev/null
+  pacman -Q grub-common &>/dev/null
   hasgrub2=$?
   pacman -Q lilo &>/dev/null
   haslilo=$?
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 79d8c5adb..455905e98 100755
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -11,12 +11,12 @@
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.4
-_releasever=9
-_rtpatchver=rt17
+_releasever=11
+_rtpatchver=rt19
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
-pkgrel=1.1
-_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -37,8 +37,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.4.4-fix-backlight-regression.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
-         '6ef5ab23e1999605f0185a6fc4d224f2'
-         '8ddc7ee43b418e06121bd09fa0e97bf6'
+         '00eaf4013fc8cfe73498d910b0b5c826'
+         'be2541bbe5455203b054c6acc3f999bf'
          'd176ceb303ecfb2303d9659ea2dd91c7'
          'bcb219ab37ed19912126189cfca30538'
          '82496e68851d1960543a07ba51cdb44a'
@@ -48,7 +48,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          '80a46681386bb87813989faeb92bdd9a'
-         '9ead3a0a09633b4da08983b2584b4c6f')
+         '4537ac9f15f96430c431d0ac22f43b80')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -235,11 +235,11 @@ _package() {
   mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-RT}"
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-RT}/version"
 
-  # move module tree /lib -> /usr/lib
-  mv "$pkgdir/lib" "$pkgdir/usr"
-
   # Now we call depmod...
   depmod -b "$pkgdir" -F System.map "$_kernver"
+
+  # move module tree /lib -> /usr/lib
+  mv "$pkgdir/lib" "$pkgdir/usr"
 }
 
 _package-headers() {
@@ -310,7 +310,7 @@ _package-headers() {
 
   cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
 
-  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
+  for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do
     mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
     cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
   done
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index 1f57ce546..54d0c0a89 100755
--- 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.9-1.1-rt17-LIBRE-RT
+KERNEL_VERSION=3.4.11-1-rt19-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'
@@ -33,7 +33,7 @@ post_install () {
 post_upgrade() {
   pacman -Q grub &>/dev/null
   hasgrub=$?
-  pacman -Q grub2-common &>/dev/null
+  pacman -Q grub-common &>/dev/null
   hasgrub2=$?
   pacman -Q lilo &>/dev/null
   haslilo=$?