diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-04 16:03:12 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-04 16:03:12 -0300 |
commit | 6320403e34f67650b789aa2f0909c1671fe29d45 (patch) | |
tree | 6b34d83542e08a434122d51bee5bd53c76d5f7d2 /kernels/linux-libre-pae/PKGBUILD | |
parent | e6d75a76602a8d1f1022589c77b5ba754f62975a (diff) | |
parent | 5a53dfa50322787f5a4d8af16743c83cab48f0fa (diff) | |
download | abslibre-6320403e34f67650b789aa2f0909c1671fe29d45.tar.gz abslibre-6320403e34f67650b789aa2f0909c1671fe29d45.tar.bz2 abslibre-6320403e34f67650b789aa2f0909c1671fe29d45.zip |
Merge branch 'master' of vparabola:abslibre
Conflicts:
libre/pacman/PKGBUILD
Diffstat (limited to 'kernels/linux-libre-pae/PKGBUILD')
-rw-r--r-- | kernels/linux-libre-pae/PKGBUILD | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 6b20f933e..73e6a725d 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $ +# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $ # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> # Contributor (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.14 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -24,16 +24,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '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' - '0004-fs-Don-t-return-0-from-get_anon_bdev.patch' '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch' '0006-genksyms-fix-typeof-handling.patch' '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch' '0011-kernfs-fix-removed-error-check.patch' '0012-fix-saa7134.patch' - '0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch' '0015-fix-xsdt-validation.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815' + '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8' 'fa4a0141d51dd76d6b57980278a95614d53c51af1cdf983789ed546a47302e2c' '292d5c553f87246c8dc2d57cadfd2db92a3750173b4588d53c2919743171eca5' '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177' @@ -41,13 +39,11 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1' '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85' '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - 'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be' '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4') _kernelname=${pkgbase#linux-libre} @@ -78,10 +74,6 @@ prepare() { 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 various bugs caused by rootfs having FSID 0 - # See http://www.spinics.net/lists/kernel/msg1716924.html - patch -p1 -i "${srcdir}/0004-fs-Don-t-return-0-from-get_anon_bdev.patch" - # Disable usb autosuspend for intel btusb # See http://www.spinics.net/lists/kernel/msg1716461.html # Until a solution is found, make sure the driver leaves autosuspend alone @@ -104,11 +96,6 @@ prepare() { # https://bugzilla.kernel.org/show_bug.cgi?id=73361 patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - # fix tun/openvpn performance - # https://bugs.archlinux.org/task/40089 - # https://bugzilla.kernel.org/show_bug.cgi?id=74051 - patch -Np1 -i "${srcdir}/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch" - # fix xsdt validation bug # https://bugs.archlinux.org/task/39811 # https://bugzilla.kernel.org/show_bug.cgi?id=73911 @@ -172,7 +159,6 @@ _package() { make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" - # set correct depmod command for install cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" true && install=${install}.pkg |