Update linux-drd to 3.17

1 files changed, 16 insertions, 19 deletions

diff --git a/linux-drd/PKGBUILD b/linux-drd/PKGBUILD
index cb0bdf9..0c1bbef 100644
--- a/linux-drd/PKGBUILD
+++ b/linux-drd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 221856 2014-09-17 20:14:58Z tpowa $
+# $Id: PKGBUILD 223924 2014-10-06 16:08:16Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 # pkgbase=linux               # Build stock -ARCH kernel
 pkgbase=linux-drd       # Build kernel with a different name
-_srcname=linux-3.16
-pkgver=3.16.3
+_srcname=linux-3.17
+pkgver=3.17
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -13,24 +13,22 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
-        "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+        #"https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
         # the main kernel config files
         'config' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
-        'compal-laptop-hwmon-fix.patch'
         'aufs3-standalone::git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.16'
-        # 'aufs3-mmap.patch'
+        'aufs3-mmap.patch'
         )
-sha256sums=('4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0'
-            '3fbe03714f943605d711ff317aa52053e29bc50e63a8e6a17c2504cde1160208'
-            '441fddfd56c28efbf6b61f0f2777ce14e259b9215bae7729800507d98cc223ad'
-            '553ab307e5a25d9c3050106878fcb12c464922cc649c03613238ff780be43ff5'
+sha256sums=('f5153ec93c5fcd41b247950e6a9bcbc63fa87beafd112c133a622439a0f76251'
+            'a66e1cab5c41a83fb0e9e04dfa5c7097ab3ca61aa03a50bc5c67390d859c4c3a'
+            'ac858029381a033a976442514abc46a5e0fea703c078433e57960c9a51209ecb'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588'
-            'SKIP')
+            'SKIP'
+            'c15fe5ce9d8fba5b810505894ee0f67189ae0c11c591f5e377485e726a3c032c')
 
 _kernelname=${pkgbase#linux}
 
@@ -38,7 +36,7 @@ prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  patch -p1 -i "${srcdir}/patch-${pkgver}"
+  # patch -p1 -i "${srcdir}/patch-${pkgver}"
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -48,14 +46,11 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # #41458 fix hwmon for compal-laptop module
-  patch -p1 -i "${srcdir}/compal-laptop-hwmon-fix.patch"
-
   ## aufs3
   patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-kbuild.patch"
   patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-base.patch"
-  patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-mmap.patch"
-  # patch -p1 -i "${srcdir}/aufs3-mmap.patch"
+  # patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-mmap.patch"
+  patch -p1 -i "${srcdir}/aufs3-mmap.patch"
   cp -R "${srcdir}/aufs3-standalone/Documentation" .
   cp -R "${srcdir}/aufs3-standalone/fs" .
   cp -R "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" \
@@ -262,7 +257,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 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
@@ -323,6 +319,7 @@ _package-api-headers() {
 pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs" "${pkgbase}-api-headers")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
+    $(declare -f "_package${_p#${pkgbase}}")
     _package${_p#${pkgbase}}
   }"
 done