diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-02-05 17:09:15 +0200 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-05-01 16:07:39 +0300 |
| commit | e175c89c4286b30b647db54222e8e7ac98148b6c (patch) | |
| tree | c240253fc67829d395740ff69b66a21462e39ba2 | |
| parent | Toggle config setting (diff) | |
| download | linux-ck-e175c89c4286b30b647db54222e8e7ac98148b6c.tar.xz | |
Fix zfs-dkms breakage due to GPL zealotry
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | zfs.patch | 20 |
2 files changed, 24 insertions, 0 deletions
@@ -43,6 +43,7 @@ options=('!strip') _srcname=linux-${pkgver} source=( https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign} + zfs.patch 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/${_supver}.0/${_supver}.${_majver}/${_supver}.${_majver}-${_ckpatchversion}/patch-${_supver}.${_majver}-${_ckpatchversion}.xz graysky_bdver2-hotfix.patch @@ -59,6 +60,7 @@ validpgpkeys=( # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc b2sums=('510a9b98c2e260aca6d74eadd34e407f62ed60f93a42bb10fd1bbc02f04d0e6a07cd84da75e55b2c4f0d97feeed83f56993e5f8a12a705ffb0a9ceda1778c01c' 'SKIP' + '4b982e16e3fee2c2c40db08d67a6cc794c27308c4b513a9baf909c5ea40e3be239288ba4c422e8eb58a669646d331e7fd945d7451d1a388f1c68fe3a445aa814' 'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e' '20dba509c16cf41226414c2e70e2a3434573638bf93ce25786c2cd4663c98bfa04845cda780c750afbfa26918cffa394d905d16bd687d6145acb8dbd2489fdd0' '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e' @@ -87,6 +89,8 @@ prepare() { patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch patch -p1 -i ../sphinx-workaround.patch + msg2 "Fixing ZFS compatibility" + patch -p1 -i ../zfs.patch # fix naming schema in EXTRAVERSION of ck patch set sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}" diff --git a/zfs.patch b/zfs.patch new file mode 100644 index 0000000..7df5914 --- /dev/null +++ b/zfs.patch @@ -0,0 +1,20 @@ +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h +@@ -360,7 +360,7 @@ + WARN_ON_ONCE(current->rcu_read_lock_nesting > RCU_NEST_PMAX); + barrier(); /* critical section after entry code. */ + } +-EXPORT_SYMBOL_GPL(__rcu_read_lock); ++EXPORT_SYMBOL(__rcu_read_lock); + + /* + * Preemptible RCU implementation for rcu_read_unlock(). +@@ -390,7 +390,7 @@ + WARN_ON_ONCE(rrln < 0 && rrln > RCU_NEST_NMAX); + } + } +-EXPORT_SYMBOL_GPL(__rcu_read_unlock); ++EXPORT_SYMBOL(__rcu_read_unlock); + + /* + * Advance a ->blkd_tasks-list pointer to the next entry, instead |