linux-libre-rt-3.18.7_gnu.rt1-1: updating version

1 files changed, 16 insertions, 37 deletions

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 9298d357d..81ee09dd3 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -11,10 +11,10 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgbase=linux-libre-rt      # Build stock -rt kernel
-_pkgbasever=3.14-gnu
-_pkgver=3.14.31-gnu
-_rtbasever=3.14
-_rtpatchver=rt28
+_pkgbasever=3.18-gnu
+_pkgver=3.18.7-gnu
+_rtbasever=3.18
+_rtpatchver=rt1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -34,41 +34,30 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign"
         "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz"
-        #"patch-${_pkgver%-*}-${_rtpatchver}.patch.xz.sign::http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.sign"
         # the main kernel config files
         'config.i686' 'config.x86_64' 'config.mips64el'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm}
         'change-default-console-loglevel.patch'
-        '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
-        '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
-        '0003-module-remove-MODULE_GENERIC_TABLE.patch'
-        '0006-genksyms-fix-typeof-handling.patch'
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
-        '3.14.14-a410a5e2b7-loongson-community.patch')
-sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
+        '3.18-rc6-48c0ad793f-loongson-community.patch')
+sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf'
             'SKIP'
-            '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c'
+            '84de335ee8a7c579f643980bbad7713f191b6a3a46ea502093bf54ff72fc4af6'
             'SKIP'
-            '0aafc2e25dbfcb98f678276b30bd681b07209452269538ab7e268967d9fda03e'
-            #'SKIP'
-            '3bfd1d22915bb891a6826f45d3f4f636ddc9f0476dbffff3e650f900f681399d'
-            'd9b1276ffaa8b4e0d08c8d47114e90167e6c0107764d6004b48a27079efcc40c'
-            'f84a820e603b0fa980b6b53a36a84383d2d851539aeaaac9fb72c962e3ee1975'
+            'd90a4a3f2d56dd80d449de64a875111bd2db1c5a4f4d79771df06fda227b0b1c'
+            '4bcc0d264549427339a9119f41bf828df49f8f53bd6b36fcff9b5d5c4dfd4289'
+            '490f914f97547fb50526b4d30c6dd9903d51c30d61c2c56cb0d2fdb54a608ad1'
+            '321861df7720b74959dddcade046156427ee45ee051e09a5d73bef7cb37b558b'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
             '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53'
             'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015'
-            'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
-            '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
-            '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
-            '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            '3baf1279805edd561e80877a1baf32d98fe07220dc6e7cb4ced73ab531947bc4')
+            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+            '81adca8b3f58156f4a245cb7f20750041a9e6848b282942d7d9e213a04c96c9f')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
-              #'5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt
 )
 
 _kernelname=${pkgbase#linux-libre}
@@ -105,20 +94,9 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # Fix vhci warning in kmod (to restore every kernel maintainer's sanity)
-  patch -p1 -i "${srcdir}/0001-Bluetooth-allocate-static-minor-for-vhci.patch"
-
-  # Fix atkbd aliases
-  patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch"
-  patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch"
-
-  # Fix generation of symbol CRCs
-  # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18
-  patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch"
-
   # Adding loongson-community patch
   if [ "${CARCH}" == "mips64el" ]; then
-    patch -p1 -i ${srcdir}/3.14.14-a410a5e2b7-loongson-community.patch
+    patch -p1 -i ${srcdir}/3.18-rc6-48c0ad793f-loongson-community.patch
   fi
 
   cat "${srcdir}/config.${CARCH}" > ./.config
@@ -304,7 +282,8 @@ _package-headers() {
   # add xfs and shmem for aufs building
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs"
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm"
-  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h"
+  # removed in 3.17-gnu series
+  # cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h"
 
   # copy in Kconfig files
   for i in $(find . -name "Kconfig*"); do