diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 16 |
2 files changed, 15 insertions, 7 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-xanmod-anbox pkgdesc = Linux Xanmod with ashmem and binder enabled for Anbox - pkgver = 5.12.9 + pkgver = 5.12.10 pkgrel = 1 url = http://www.xanmod.org/ arch = x86_64 @@ -14,14 +14,14 @@ pkgbase = linux-xanmod-anbox options = !strip source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.sign - source = https://github.com/xanmod/linux/releases/download/5.12.9-xanmod1/patch-5.12.9-xanmod1.xz + source = https://github.com/xanmod/linux/releases/download/5.12.10-xanmod1/patch-5.12.10-xanmod1.xz source = choose-gcc-optimization.sh source = sphinx-workaround.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/sphinx-workaround.patch?h=packages/linux&id=be7d4710850020de55bce930c83fa80347c02fc3 validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366 sha256sums = SKIP - sha256sums = bae3ee9c642b48abbaa609ac29d74f082bcdbdd8a1070e83b2a2ecce86d4bb99 + sha256sums = ad47cc2b1e14ad443a419af5c56c3adc29f299b399ddac72a6fd5cfc5c64265d sha256sums = 1ac18cad2578df4a70f9346f7c6fccbb62f042a0ee0594817fdef9f2704904ee sha256sums = 52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb @@ -34,6 +34,11 @@ if [ -z ${use_tracers+x} ]; then use_tracers=y fi +## Choose between GCC and CLANG config (default is GCC) +if [ -z ${_compiler+x} ]; then + _compiler=gcc +fi + # Compile ONLY used modules to VASTLY reduce the number of modules built # and the build time. # @@ -53,7 +58,7 @@ _makenconfig= pkgbase=linux-xanmod-anbox _major=5.12 -pkgver=${_major}.9 +pkgver=${_major}.10 _branch=5.x xanmod=1 pkgrel=${xanmod} @@ -86,7 +91,7 @@ done sha256sums=('7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366' 'SKIP' - 'bae3ee9c642b48abbaa609ac29d74f082bcdbdd8a1070e83b2a2ecce86d4bb99' + 'ad47cc2b1e14ad443a419af5c56c3adc29f299b399ddac72a6fd5cfc5c64265d' '1ac18cad2578df4a70f9346f7c6fccbb62f042a0ee0594817fdef9f2704904ee' '52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb') @@ -100,7 +105,6 @@ prepare() { # hacky work around for xz not getting extracted # https://bbs.archlinux.org/viewtopic.php?id=265115 if [[ ! -f "$srcdir/patch-${pkgver}-xanmod${xanmod}" ]]; then - #unlink "$srcdir/patch-${pkgver}-xanmod${xanmod}.xz" xz -dc "$SRCDEST/patch-${pkgver}-xanmod${xanmod}.xz" > "$srcdir/patch-${pkgver}-xanmod${xanmod}" fi @@ -122,6 +126,9 @@ prepare() { patch -Np1 < "../$src" done + # Applying configuration + cp -vf CONFIGS/xanmod/${_compiler}/config .config + # CONFIG_STACK_VALIDATION gives better stack traces. Also is enabled in all official kernel packages by Archlinux team scripts/config --enable CONFIG_STACK_VALIDATION @@ -156,7 +163,7 @@ prepare() { # Put the file "myconfig" at the package folder (this will take preference) or "${XDG_CONFIG_HOME}/linux-xanmod-anbox/myconfig" # If we detect partial file with scripts/config commands, we execute as a script # If not, it's a full config, will be replaced - for _myconfig in "${SRCDEST}/myconfig" "${XDG_CONFIG_HOME}/linux-xanmod-anbox/myconfig" ; do + for _myconfig in "${SRCDEST}/myconfig" "${HOME}/.config/linux-xanmod-anbox/myconfig" "${XDG_CONFIG_HOME}/linux-xanmod-anbox/myconfig" ; do if [ -f "${_myconfig}" ]; then if grep -q 'scripts/config' "${_myconfig}"; then # myconfig is a partial file. Executing as a script @@ -168,6 +175,7 @@ prepare() { cp -f "${_myconfig}" .config fi echo + break fi done |