linux-libre-{pae,xen}-3.14.1-1: updating version

2 files changed, 36 insertions, 58 deletions

diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index ae3f2e5e9..f71de8489 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 210209 2014-04-11 21:45:37Z thomas $
+# $Id: PKGBUILD 210383 2014-04-14 19:13:09Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,16 +6,15 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.14
-#pkgver=${_basekernel}.8
-pkgver=${_basekernel}
-pkgrel=5
+pkgver=${_basekernel}.1
+pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
@@ -29,24 +28,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
         '0006-genksyms-fix-typeof-handling.patch'
         '0007-x86-efi-Correct-EFI-boot-stub-use-of-code32_start.patch'
-        '0008-futex-avoid-race-between-requeue-and-wake.patch'
-        '0009-iwlwifi-mvm-rs-fix-search-cycle-rules.patch'
         '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch')
-sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
-            'd1aa49780d3d76291dfe04d79b5b0bd9246ce101dcb7a0f6818a96c28d9d0e8e'
-            '292d5c553f87246c8dc2d57cadfd2db92a3750173b4588d53c2919743171eca5'
-            '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177'
-            'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
-            '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
-            '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
-            '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1'
-            '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
-            'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            'a98bc3836bcf85774a974a1585e6b64432ba8c42363ee484d14515ccd6a88e24'
-            'f8699fcf4242c0727c3c0af56928515cef9b6ce329968537ce2894b30d43eade'
-            '1d4c7b24312ed3781e5d139dfb52f0c22350bf5a2845fe747469dfa7b6ed861f'
-            'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85')
+md5sums=('c108ec52eeb2a9b9ddbb8d12496ff25f'
+         '2b4862b3c76011e66e536f18fbf0fb27'
+         '44c66dccb03369dd7288540efad706b0'
+         'f302c931bd85309da9d9792b4cc96467'
+         '44260d2cb1a8b51c119d2ce1f83e457a'
+         '98beb36f9b8cf16e58de2483ea9985e3'
+         '6839ddec74a5300beff1709a81b0e4f3'
+         '706549e8a05f33f7fc697f28c0ca71d2'
+         'd23fc66be93ebce698bd7da844789de1'
+         'b240cc8ebb4b5d74e94b4c72d033f726'
+         'a89d593774ccb955eb8368d3bc87ce26'
+         '16a161979f846b049e90daea907c35dd'
+         '00727251b0d337a25d3ca392218afdf4'
+         '353b553d69da810ef954618aca60e1e2')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
@@ -94,13 +90,6 @@ prepare() {
   # https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=urgent&id=7e8213c1f3acc064aef37813a39f13cbfe7c3ce7
   patch -p1 -i "${srcdir}/0007-x86-efi-Correct-EFI-boot-stub-use-of-code32_start.patch"
 
-  # https://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git/tree/queue-3.14/futex-avoid-race-between-requeue-and-wake.patch
-  # FS#39806
-  patch -p1 -i "${srcdir}/0008-futex-avoid-race-between-requeue-and-wake.patch"
-
-  # Fix some intel wifi issues
-  # https://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git/tree/queue-3.14/iwlwifi-mvm-rs-fix-search-cycle-rules.patch
-  patch -p1 -i "${srcdir}/0009-iwlwifi-mvm-rs-fix-search-cycle-rules.patch"
   # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d
   # FS#39815
   patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch"
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index b5bd2e74f..0d908bea2 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 210209 2014-04-11 21:45:37Z thomas $
+# $Id: PKGBUILD 210383 2014-04-14 19:13:09Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,16 +6,15 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.14
-#pkgver=${_basekernel}.8
-pkgver=${_basekernel}
-pkgrel=5
+pkgver=${_basekernel}.1
+pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
@@ -29,24 +28,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
         '0006-genksyms-fix-typeof-handling.patch'
         '0007-x86-efi-Correct-EFI-boot-stub-use-of-code32_start.patch'
-        '0008-futex-avoid-race-between-requeue-and-wake.patch'
-        '0009-iwlwifi-mvm-rs-fix-search-cycle-rules.patch'
         '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch')
-sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
-            '2bd49bb28000063f6886816ae521b224e4c254c9523cdd70d041d913611fafbe'
-            '7a475ada892857397cf80d2de777825ae94758dc2d9dfa3754ae3d670f4a2f02'
-            '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177'
-            'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
-            '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
-            '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
-            '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1'
-            '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
-            'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            'a98bc3836bcf85774a974a1585e6b64432ba8c42363ee484d14515ccd6a88e24'
-            'f8699fcf4242c0727c3c0af56928515cef9b6ce329968537ce2894b30d43eade'
-            '1d4c7b24312ed3781e5d139dfb52f0c22350bf5a2845fe747469dfa7b6ed861f'
-            'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85')
+md5sums=('c108ec52eeb2a9b9ddbb8d12496ff25f'
+         '2b4862b3c76011e66e536f18fbf0fb27'
+         'b6e58c41ad19afbcef408f8becb8a967'
+         'b7c2805bb287a644c0a303bf7721e534'
+         '44260d2cb1a8b51c119d2ce1f83e457a'
+         '98beb36f9b8cf16e58de2483ea9985e3'
+         '6839ddec74a5300beff1709a81b0e4f3'
+         '706549e8a05f33f7fc697f28c0ca71d2'
+         'd23fc66be93ebce698bd7da844789de1'
+         'b240cc8ebb4b5d74e94b4c72d033f726'
+         'a89d593774ccb955eb8368d3bc87ce26'
+         '16a161979f846b049e90daea907c35dd'
+         '00727251b0d337a25d3ca392218afdf4'
+         '353b553d69da810ef954618aca60e1e2')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-XEN
@@ -94,13 +90,6 @@ prepare() {
   # https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=urgent&id=7e8213c1f3acc064aef37813a39f13cbfe7c3ce7
   patch -p1 -i "${srcdir}/0007-x86-efi-Correct-EFI-boot-stub-use-of-code32_start.patch"
 
-  # https://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git/tree/queue-3.14/futex-avoid-race-between-requeue-and-wake.patch
-  # FS#39806
-  patch -p1 -i "${srcdir}/0008-futex-avoid-race-between-requeue-and-wake.patch"
-
-  # Fix some intel wifi issues
-  # https://git.kernel.org/cgit/linux/kernel/git/stable/stable-queue.git/tree/queue-3.14/iwlwifi-mvm-rs-fix-search-cycle-rules.patch
-  patch -p1 -i "${srcdir}/0009-iwlwifi-mvm-rs-fix-search-cycle-rules.patch"
   # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d
   # FS#39815
   patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch"