diff options
Diffstat (limited to 'kernels/linux-libre-knock/PKGBUILD')
| -rw-r--r-- | kernels/linux-libre-knock/PKGBUILD | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index 3812103f5..011b5dd35 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-knock # Build stock knock kernel _pkgbasever=4.0-gnu -_pkgver=4.0.6-gnu +_pkgver=4.0.7-gnu _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -19,7 +19,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="https://gnunet.org/knock" license=('GPL2') @@ -41,13 +41,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'config.i686' 'config.x86_64' 'config.mips64el' # 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' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ "https://repo.parabola.nu/other/linux-libre/patches/4.0.2-ae91f13af5-loongson-community.patch" "https://repo.parabola.nu/other/linux-libre/patches/4.0.2-ae91f13af5-loongson-community.patch.sig") sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - '5cfcee748701771bb2ad46887c6b912fedfffe84bba42ad9e051be54f03a63c9' + 'c106ac1baa327ba39fc479c6b7b5c3a9f0a523ecc4db2a0be6a1f6f700d5cc53' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' @@ -61,6 +63,8 @@ sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'e56bd8db7d7bd0ccf46518e364f51fe57e0d9cb848a3daab145f2b7380a7fe9b' 'cff141410c90ec34ce6e3f352f57d302db4304ea87564a1fbe888db97f28fbea' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '0682df710e8d23f0d420b3b01fbfe409b3911940b1a379b78d9f4a5ac8590386' + 'af42b1456caee0b0db8f3cc770c78083b40159260b99db4930e503ac7824eacc' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '13e141279af2bc17decfc041e015710daac9a6cd1c9b4e871a76cb8f916b9e22' 'SKIP') @@ -99,6 +103,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) |