diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0001-make_flush_workqueue_non_gpl.patch | 34 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 8 insertions, 56 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-c720 - pkgver = 4.2.1 + pkgver = 4.2.2 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -13,25 +13,23 @@ pkgbase = linux-c720 options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.1.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.1.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.2.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.2.sign source = config source = config.x86_64 source = linux.preset source = change-default-console-loglevel.patch - source = 0001-make_flush_workqueue_non_gpl.patch source = 0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch source = 0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch source = 0001-fix-bridge-regression.patch sha256sums = cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb sha256sums = SKIP - sha256sums = 9d0ab6525eb5f42056e2465267c62fa67efc75c57ad5345b99414b783278e9a3 + sha256sums = 8b4578f1e1dcfbef1e39c39b861d4715aa99917af0b7c2dc324622d65884dcb5 sha256sums = SKIP - sha256sums = fbab0b70feb19c5bdab3eed73d05bcf02aedaf93bdd903bf4cd1c593fb42ea09 + sha256sums = 6eb2dc9edfb5280912c24f16bf72248f51da8823651c429cb1d00d44df768e85 sha256sums = a071aaa327d2b3577fa4709b47ed5fe81c7914d168607f3db905fdbf226247e7 sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 - sha256sums = 4e776734e2c2185910a6fbb6f333d967b04f4a72b3196310af286c6a779bd97d sha256sums = 0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b sha256sums = 6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3 sha256sums = 0a8fe4434e930d393c7983e335842f6cb77ee263af5592a0ca7e14bae7296183 @@ -46,9 +44,3 @@ pkgname = linux-c720 optdepends = crda: to set the correct wireless channels of your country backup = etc/mkinitcpio.d/linux-c720.preset -pkgname = linux-c720-headers - pkgdesc = Header files and scripts for building modules for Linux-c720 kernel - -pkgname = linux-c720-docs - pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-c720 kernel - diff --git a/0001-make_flush_workqueue_non_gpl.patch b/0001-make_flush_workqueue_non_gpl.patch deleted file mode 100644 index 1ba8cb9b3de0..000000000000 --- a/0001-make_flush_workqueue_non_gpl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65 Mon Sep 17 00:00:00 2001 -From: Tim Gardner <tim.gardner@canonical.com> -Date: Tue, 4 Aug 2015 11:26:04 -0600 -Subject: workqueue: Make flush_workqueue() available again to non GPL modules - -Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move -flush_scheduled_work() to workqueue.h") moved the exported non GPL -flush_scheduled_work() from a function to an inline wrapper. -Unfortunately, it directly calls flush_workqueue() which is a GPL function. -This has the effect of changing the licensing requirement for this function -and makes it unavailable to non GPL modules. - -See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make -schedule_work() available again to non GPL modules") for precedent. - -Signed-off-by: Tim Gardner <tim.gardner@canonical.com> -Signed-off-by: Tejun Heo <tj@kernel.org> - -diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index 4c4f061..a413acb 100644 ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c -@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq) - out_unlock: - mutex_unlock(&wq->mutex); - } --EXPORT_SYMBOL_GPL(flush_workqueue); -+EXPORT_SYMBOL(flush_workqueue); - - /** - * drain_workqueue - drain a workqueue --- -cgit v0.10.2 - @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 247063 2015-09-22 05:59:35Z tpowa $ +# $Id: PKGBUILD 247911 2015-09-30 04:43:22Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> #pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-c720 # Build kernel with a different name _srcname=linux-4.2 -pkgver=4.2.1 +pkgver=4.2.2 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -21,19 +21,17 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' - '0001-make_flush_workqueue_non_gpl.patch' '0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch' '0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch' '0001-fix-bridge-regression.patch') sha256sums=('cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb' 'SKIP' - '9d0ab6525eb5f42056e2465267c62fa67efc75c57ad5345b99414b783278e9a3' + '8b4578f1e1dcfbef1e39c39b861d4715aa99917af0b7c2dc324622d65884dcb5' 'SKIP' '6eb2dc9edfb5280912c24f16bf72248f51da8823651c429cb1d00d44df768e85' 'a071aaa327d2b3577fa4709b47ed5fe81c7914d168607f3db905fdbf226247e7' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '4e776734e2c2185910a6fbb6f333d967b04f4a72b3196310af286c6a779bd97d' '0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b' '6ed9e31ae5614c289c4884620e45698e764c03670ebc45bab9319d741238cbd3' '0a8fe4434e930d393c7983e335842f6cb77ee263af5592a0ca7e14bae7296183') @@ -53,10 +51,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # fix work_queue symbol to non GPL for nvidia module building - # already applied to 4.3 series - patch -p1 -i "${srcdir}/0001-make_flush_workqueue_non_gpl.patch" - # fix hard lockup in e1000e_cyclecounter_read() after 4 hours of uptime # https://lkml.org/lkml/2015/8/18/292 patch -p1 -i "${srcdir}/0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch" |