summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-pae/PKGBUILD
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-07-04 02:51:43 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-07-04 13:17:05 -0300
commit8bb056a88b782883b52083ba68f763226e6090a2 (patch)
tree5b1121894a117ad3e8718336eabb2f4cc4632950 /kernels/linux-libre-pae/PKGBUILD
parent2037d015f9819fcd5ee1ae25f353b1019c274fb3 (diff)
linux-libre-{pae,xen}-4.0.7_gnu-2: updating version
* fix deadlock with stacked loop devices (FS#45129 -> https://bugs.archlinux.org/task/45129)
Diffstat (limited to 'kernels/linux-libre-pae/PKGBUILD')
-rw-r--r--kernels/linux-libre-pae/PKGBUILD15
1 files changed, 12 insertions, 3 deletions
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 46d2a477d..5b3e94f1f 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -9,7 +9,7 @@
pkgbase=linux-libre-pae # Build stock -pae kernel
_pkgbasever=4.0-gnu
-_pkgver=4.0.6-gnu
+_pkgver=4.0.7-gnu
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -18,7 +18,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
_srcname=linux-${_pkgbasever%-*}
_archpkgver=${_pkgver%-*}
pkgver=${_pkgver//-/_}
-pkgrel=1
+pkgrel=2
arch=('i686')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -38,10 +38,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'config'
# standard config files for mkinitcpio ramdisk
'linux.preset'
+ '0001-block-loop-convert-to-per-device-workqueue.patch'
+ '0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch'
'change-default-console-loglevel.patch')
sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a'
'SKIP'
- '5cfcee748701771bb2ad46887c6b912fedfffe84bba42ad9e051be54f03a63c9'
+ 'c106ac1baa327ba39fc479c6b7b5c3a9f0a523ecc4db2a0be6a1f6f700d5cc53'
'SKIP'
'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
'SKIP'
@@ -51,6 +53,8 @@ sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a'
'SKIP'
'a77c1bd4473e4a6eae2f276f4fc677054732cd282e001bbe8abab8da7fcda60a'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
+ '0682df710e8d23f0d420b3b01fbfe409b3911940b1a379b78d9f4a5ac8590386'
+ 'af42b1456caee0b0db8f3cc770c78083b40159260b99db4930e503ac7824eacc'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -77,6 +81,11 @@ prepare() {
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+ # Fix deadlock with stacked loop devices (FS#45129)
+ # http://marc.info/?l=linux-kernel&m=143280649731902&w=2
+ patch -Np1 -i ../0001-block-loop-convert-to-per-device-workqueue.patch
+ patch -Np1 -i ../0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch
+
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)