Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

12 files changed, 15 insertions, 15 deletions

diff --git a/kernels/linux-libre-lts-rt/.directory b/kernels/linux-libre-lts-rt/.directory
index 7a883fed9..7a883fed9 100644..100755
--- a/kernels/linux-libre-lts-rt/.directory
+++ b/kernels/linux-libre-lts-rt/.directory
diff --git a/kernels/linux-libre-lts-rt/Kbuild b/kernels/linux-libre-lts-rt/Kbuild
index 8a9d7dceb..8a9d7dceb 100644..100755
--- a/kernels/linux-libre-lts-rt/Kbuild
+++ b/kernels/linux-libre-lts-rt/Kbuild
diff --git a/kernels/linux-libre-lts-rt/Kbuild.platforms b/kernels/linux-libre-lts-rt/Kbuild.platforms
index 90a226888..90a226888 100644..100755
--- a/kernels/linux-libre-lts-rt/Kbuild.platforms
+++ b/kernels/linux-libre-lts-rt/Kbuild.platforms
diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD
index 74a883c1b..daf2d1c16 100644..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')
@@ -36,13 +36,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'i915-fix-ghost-tv-output.patch'
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-
-_kernelname=${pkgbase#linux-libre}
-_localversionname=-LIBRE-LTS-RT
-_aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'b4ebaa2ebf8418c75aba96fd4dd6daf3'
-         '11bb95e505726abd1e1adfa522ef178f'
+         'c4b4e6d908e70fc6f991a1789a3ac620'
+         'bcca49907b1c1e74f6ff6afced5ff959'
          '7266f5e7af09cc6e4b15d7a952e3b350'
          '5387f0cf51652c071190789569adf9c7'
          '85f04a9555bdc295f7c387a6564f0c81'
@@ -52,13 +48,17 @@ 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]
     unset md5sums[${#md5sums[@]}-1]
 fi
 
+_kernelname=${pkgbase#linux-libre}
+_localversionname=-LIBRE-LTS-RT
+_aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours
+
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
@@ -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/boot-logo.patch b/kernels/linux-libre-lts-rt/boot-logo.patch
index c392928a5..c392928a5 100644..100755
--- a/kernels/linux-libre-lts-rt/boot-logo.patch
+++ b/kernels/linux-libre-lts-rt/boot-logo.patch
diff --git a/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch b/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch
index 63435d84f..63435d84f 100644..100755
--- a/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch
+++ b/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch
diff --git a/kernels/linux-libre-lts-rt/config.i686 b/kernels/linux-libre-lts-rt/config.i686
index 39bc1c678..39bc1c678 100644..100755
--- a/kernels/linux-libre-lts-rt/config.i686
+++ b/kernels/linux-libre-lts-rt/config.i686
diff --git a/kernels/linux-libre-lts-rt/config.x86_64 b/kernels/linux-libre-lts-rt/config.x86_64
index 826a006b2..826a006b2 100644..100755
--- a/kernels/linux-libre-lts-rt/config.x86_64
+++ b/kernels/linux-libre-lts-rt/config.x86_64
diff --git a/kernels/linux-libre-lts-rt/ext4-options.patch b/kernels/linux-libre-lts-rt/ext4-options.patch
index 812b05f04..812b05f04 100644..100755
--- a/kernels/linux-libre-lts-rt/ext4-options.patch
+++ b/kernels/linux-libre-lts-rt/ext4-options.patch
diff --git a/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch
index 3b631361a..3b631361a 100644..100755
--- a/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch
+++ b/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch
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 100644..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-lts-rt/linux-libre-lts-rt.preset b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset
index 5b84d8b9f..5b84d8b9f 100644..100755
--- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset
+++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset