summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoan Figueras2021-02-27 09:43:10 +0100
committerJoan Figueras2021-02-27 09:43:10 +0100
commite749af56cfc96f3428e115279cc5ec575b81dd0e (patch)
tree4ed5e572cb4ca7005b27e5fddebf5b74a3802cc0
parent80d15bddc123a64657e923e1d3340ddb18678a4f (diff)
downloadaur-e749af56cfc96f3428e115279cc5ec575b81dd0e.tar.gz
Removed use_ns
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
2 files changed, 4 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c4d411d63a2..d5fecea0612 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-xanmod-lts54
pkgdesc = Linux Xanmod LTS
pkgver = 5.4.100
- pkgrel = 1
+ pkgrel = 2
url = http://www.xanmod.org/
arch = x86_64
license = GPL2
@@ -16,14 +16,12 @@ pkgbase = linux-xanmod-lts54
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign
source = https://github.com/xanmod/linux/releases/download/5.4.100-xanmod1/patch-5.4.100-xanmod1.xz
source = choose-gcc-optimization.sh
- source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch::https://aur.archlinux.org/cgit/aur.git/plain/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch?h=linux-ck&id=616ec1bb1f2c0fc42b6fb5c20995996897b4f43b
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
sha256sums = SKIP
sha256sums = eb4ab03a82c99ca94df13a514b3b7cf4fa9885464407d75178139ec9a1476741
sha256sums = 03bb8b234a67b877a34a8212936ba69d8700c54c7877686cbd9742a536c87134
- sha256sums = 9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee
pkgname = linux-xanmod-lts54
pkgdesc = The Linux kernel and modules with Xanmod patches
diff --git a/PKGBUILD b/PKGBUILD
index c306b194523..57dd81861d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,13 +41,6 @@ if [ -z ${use_pds+x} ]; then
use_pds=n
fi
-## Enable CONFIG_USER_NS_UNPRIVILEGED flag https://aur.archlinux.org/cgit/aur.git/tree/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch?h=linux-ck
-## Set variable "use_ns" to: n to disable (stock Xanmod)
-## y to enable (stock Archlinux)
-if [ -z ${use_ns+x} ]; then
- use_ns=n
-fi
-
# Compile ONLY used modules to VASTLYreduce the number of modules built
# and the build time.
#
@@ -70,7 +63,7 @@ pkgver=5.4.100
_major=5.4
_branch=5.x
xanmod=1
-pkgrel=${xanmod}
+pkgrel=2
pkgdesc='Linux Xanmod LTS'
url="http://www.xanmod.org/"
arch=(x86_64)
@@ -84,8 +77,7 @@ _srcname="linux-${pkgver}-xanmod${xanmod}"
source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar."{xz,sign}
"https://github.com/xanmod/linux/releases/download/${pkgver}-xanmod${xanmod}/patch-${pkgver}-xanmod${xanmod}.xz"
- choose-gcc-optimization.sh
- '0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch::https://aur.archlinux.org/cgit/aur.git/plain/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch?h=linux-ck&id=616ec1bb1f2c0fc42b6fb5c20995996897b4f43b')
+ choose-gcc-optimization.sh)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -101,8 +93,7 @@ done
sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
'SKIP'
'eb4ab03a82c99ca94df13a514b3b7cf4fa9885464407d75178139ec9a1476741'
- '03bb8b234a67b877a34a8212936ba69d8700c54c7877686cbd9742a536c87134'
- '9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee')
+ '03bb8b234a67b877a34a8212936ba69d8700c54c7877686cbd9742a536c87134')
export KBUILD_BUILD_HOST=${KBUILD_BUILD_HOST:-archlinux}
export KBUILD_BUILD_USER=${KBUILD_BUILD_USER:-makepkg}
@@ -153,11 +144,6 @@ prepare() {
scripts/config --enable CONFIG_SCHED_PDS
fi
- if [ "$use_ns" = "n" ]; then
- msg2 "Disabling CONFIG_USER_NS_UNPRIVILEGED"
- scripts/config --disable CONFIG_USER_NS_UNPRIVILEGED
- fi
-
# Let's user choose microarchitecture optimization in GCC
sh ${srcdir}/choose-gcc-optimization.sh $_microarchitecture