diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 155 |
1 files changed, 93 insertions, 62 deletions
@@ -1,6 +1,6 @@ -# Maintainer: ANDRoid7890 <andrey.android7890@gmail.com> +# Maintainer: parov0z <andrey.android7890@gmail.com> -# https://gitlab.manjaro.org/packages/core/linux512 +# https://gitlab.manjaro.org/packages/core/linux515 # # Maintainer: Philip Müller # Maintainer: Bernhard Landauer @@ -11,9 +11,6 @@ # Maintainer: Joan Figueras # Contributor: Torge Matthies # Contributor: Jan Alexander Steffens (heftig) -# Contributor: Yoshi2889 -# Contributor: Tobias Powalowski -# Contributor: Thomas Baechler ## ## The following variables can be customized at build time. Use env or export to change at your wish @@ -36,17 +33,32 @@ if [ -z ${use_numa+x} ]; then use_numa=y fi -## For performance you can disable FUNCTION_TRACER/GRAPH_TRACER. Limits debugging and analyzing of the kernel. -## Stock Archlinux and Xanmod have this enabled. -## Set variable "use_tracers" to: n to disable (possibly increase performance) -## y to enable (stock default) +## Since upstream disabled CONFIG_STACK_TRACER (limits debugging and analyzing of the kernel) +## you can enable them setting this option. Caution, because they have an impact in performance. +## Stock Archlinux has this enabled. +## Set variable "use_tracers" to: n to disable (possibly increase performance, XanMod default) if [ -z ${use_tracers+x} ]; then - use_tracers=y + use_tracers=n fi +# Unique compiler supported upstream is GCC ## Choose between GCC and CLANG config (default is GCC) -if [ -z ${_compiler+x} ]; then - _compiler=gcc +## Use the environment variable "_compiler=clang" +if [ "${_compiler}" = "clang" ]; then + _compiler_flags="CC=clang HOSTCC=clang LLVM=1 LLVM_IAS=1" +fi + +# Choose between the 4 main configs for stable branch. Default x86-64-v1 which use CONFIG_GENERIC_CPU2: +# Possible values: config_x86-64-v1 / config_x86-64-v2 (default) / config_x86-64-v3 / config_x86-64-v4 +# This will be overwritten by selecting any option in microarchitecture script +# Source files: https://github.com/xanmod/linux/tree/5.17/CONFIGS/xanmod/gcc +if [ -z ${_config+x} ]; then + _config=config_x86-64-v2 +fi + +# Compress modules with ZSTD (to save disk space) +if [ -z ${_compress_modules+x} ]; then + _compress_modules=n fi # Compile ONLY used modules to VASTLY reduce the number of modules built @@ -62,29 +74,34 @@ if [ -z ${_localmodcfg} ]; then fi # Tweak kernel options prior to a build via nconfig -_makenconfig= +if [ -z ${_makenconfig} ]; then + _makenconfig=n +fi ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-manjaro-xanmod pkgname=("${pkgbase}" "${pkgbase}-headers") -_major=5.13 -pkgver=${_major}.16 -_branch=5.x +_major=6.6 +pkgver=${_major}.9 +_branch=6.x xanmod=1 +_sf_branch=main pkgrel=1 -pkgdesc='Linux Xanmod' +pkgdesc='Linux Manjaro Xanmod' url="http://www.xanmod.org/" arch=(x86_64) -__commit="7594e073803ee2670bf39c3c4389df482b98fda6" # 5.13.6-1 +__commit="14b0a9c44b9aafe0efdd16bf79b81ddda1d703da" # 6.6.9 license=(GPL2) + makedepends=( - xmlto kmod inetutils bc libelf cpio - python-sphinx python-sphinx_rtd_theme graphviz imagemagick git + bc cpio gettext libelf pahole perl python tar xz + python-sphinx inetutils kmod xmlto ) + if [ "${_compiler}" = "clang" ]; then makedepends+=(clang llvm lld python) fi @@ -92,24 +109,23 @@ options=('!strip') _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" + "patch-${pkgver}-xanmod${xanmod}${_revision}.xz::https://sourceforge.net/projects/xanmod/files/releases/${_sf_branch}/${pkgver}-xanmod${xanmod}/patch-${pkgver}-xanmod${xanmod}.xz/download" choose-gcc-optimization.sh - "https://gitlab.manjaro.org/packages/core/linux513/-/archive/${__commit}/linux513-${__commit}.tar.gz") + "https://gitlab.manjaro.org/packages/core/linux${_major//.}/-/archive/${__commit}/linux${_major//.}-${__commit}.tar.gz") #"patch-${pkgver}-xanmod${xanmod}.xz::https://sourceforge.net/projects/xanmod/files/releases/stable/${pkgver}-xanmod${xanmod}/patch-${pkgver}-xanmod${xanmod}.xz/download" # Archlinux patches _commit="ec9e9a4219fe221dec93fa16fddbe44a34933d8d" _patches=() for _patch in ${_patches[@]}; do - #source+=("${_patch}::https://git.archlinux.org/svntogit/packages.git/plain/trunk/${_patch}?h=packages/linux&id=${_commit}") source+=("${_patch}::https://raw.githubusercontent.com/archlinux/svntogit-packages/${_commit}/trunk/${_patch}") done -sha256sums=('3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9' # kernel tar.xz +sha256sums=('d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0' # kernel tar.xz 'SKIP' # tar.sign - 'c592493b529c2e82e466b38ef8926bc3a748fda0fea26a9860ce210d10f640fc' # xanmod - '1ac18cad2578df4a70f9346f7c6fccbb62f042a0ee0594817fdef9f2704904ee' # choose-gcc-optimization.sh - '8e231ddeed9f9d86c989ce8691d734833413952804b55d1e048d43511b184c44') # manjaro + '674be54d39a405cd11d8cbd9c2604f5e6e7fedee6b37d307edbb8ac46bc6a27f' # xanmod + 'a8b38eb482eb685944757182c4886404abc12703e5e56ec39c7d61298d17d71f' # choose-gcc-optimization.sh + 'ac7d476c2a4eff99929909e97263142770923e24decddedf04735867294d6e0e') # manjaro validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds @@ -127,7 +143,6 @@ prepare() { patch -Np1 -i ../patch-${pkgver}-xanmod${xanmod} msg2 "Setting version..." - scripts/setlocalversion --save-scmversion #echo "-$pkgrel" > localversion.10-pkgrel echo "-MANJARO" > localversion.20-pkgname @@ -141,28 +156,31 @@ prepare() { patch -Np1 < "../$src" done - # Manjaro patches - rm ../linux513-$__commit/0103-futex.patch # remove conflicting ones - rm ../linux513-$__commit/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch + # Manjaro patches + + # remove conflicting ones + patchdir=../linux${_major//.}-$__commit + rm $patchdir/0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch + # fix patch order + mv $patchdir/000{1,0}-ALSA-hda-cs35l41-Support-ASUS-2023-laptops-with-miss.patch + + local _patch - for _patch in ../linux513-$__commit/*; do + for _patch in ../linux${_major//.}-$__commit/*; do [[ $_patch = *.patch ]] || continue msg2 "Applying patch: $_patch..." - patch -Np1 < "../linux513-$__commit/$_patch" + patch -Np1 < "../linux${_major//.}-$__commit/$_patch" done - git apply -p1 < "../linux513-$__commit/0513-bootsplash.gitpatch" # Applying configuration - cp -vf CONFIGS/xanmod/${_compiler}/config .config + cp -vf CONFIGS/xanmod/gcc/${_config} .config # enable LTO_CLANG_THIN if [ "${_compiler}" = "clang" ]; then scripts/config --disable LTO_CLANG_FULL scripts/config --enable LTO_CLANG_THIN - _LLVM=1 fi - scripts/config --enable CONFIG_BOOTSPLASH # CONFIG_STACK_VALIDATION gives better stack traces. Also is enabled in all official kernel packages by Archlinux team scripts/config --enable CONFIG_STACK_VALIDATION @@ -174,7 +192,7 @@ prepare() { # User set. See at the top of this file if [ "$use_tracers" = "n" ]; then msg2 "Disabling FUNCTION_TRACER/GRAPH_TRACER only if we are not compiling with clang..." - if [ "${_compiler}" = "gcc" ]; then + if [ "${_compiler}" = "gcc" ] || [ "${_compiler}q" = "q" ]; then scripts/config --disable CONFIG_FUNCTION_TRACER \ --disable CONFIG_STACK_TRACER fi @@ -186,7 +204,6 @@ prepare() { fi msg2 "add anbox support" - scripts/config --enable CONFIG_ASHMEM # CONFIG_ION is not set scripts/config --enable CONFIG_ANDROID scripts/config --enable CONFIG_ANDROID_BINDER_IPC @@ -196,8 +213,16 @@ prepare() { scripts/config --set-str CONFIG_DEFAULT_HOSTNAME "manjaro" + # Compress modules by default (following Arch's kernel) + if [ "$_compress_modules" = "y" ]; then + scripts/config --enable CONFIG_MODULE_COMPRESS_ZSTD + fi + # Let's user choose microarchitecture optimization in GCC - sh ${srcdir}/choose-gcc-optimization.sh $_microarchitecture + # Use default microarchitecture only if we have not choosen another microarchitecture + if [ "$_microarchitecture" -ne "0" ]; then + ../choose-gcc-optimization.sh $_microarchitecture + fi # This is intended for the people that want to build this package with their own config # Put the file "myconfig" at the package folder (this will take preference) or "${XDG_CONFIG_HOME}/linux-xanmod/myconfig" @@ -219,25 +244,26 @@ prepare() { fi done - ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ "$_localmodcfg" = "y" ]; then if [ -f $HOME/.config/modprobed.db ]; then msg2 "Running Steven Rostedt's make localmodconfig now" - make LSMOD=$HOME/.config/modprobed.db localmodconfig + make ${_compiler_flags} LSMOD=$HOME/.config/modprobed.db localmodconfig else msg2 "No modprobed.db data found" exit 1 fi fi - make LLVM=$_LLVM LLVM_IAS=$_LLVM olddefconfig + make ${_compiler_flags} olddefconfig make -s kernelrelease > version msg2 "Prepared %s version %s" "$pkgbase" "$(<version)" - [[ -z "$_makenconfig" ]] || make LLVM=$_LLVM LLVM_IAS=$_LLVM nconfig + if [ "$_makenconfig" = "y" ]; then + make ${_compiler_flags} nconfig + fi # save configuration for later reuse cat .config > "${SRCDEST}/config.last" @@ -245,22 +271,23 @@ prepare() { build() { cd linux-${_major} - make LLVM=$_LLVM LLVM_IAS=$_LLVM all + make ${_compiler_flags} all } _package() { - pkgdesc="The Linux kernel and modules with Xanmod and Manjaro patches (Bootsplash support). Ashmem and binder are enabled" - depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs' 'mkinitcpio>=27') - optdepends=('crda: to set the correct wireless channels of your country' - 'linux-firmware: firmware images needed for some devices' - 'bootsplash-systemd: for bootsplash functionality') - provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE) + pkgdesc="The Linux kernel and modules with Xanmod and Manjaro patches" + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') + optdepends=('wireless-regdb: to set the correct wireless channels of your country' + 'linux-firmware: firmware images needed for some devices') + provides=(VIRTUALBOX-GUEST-MODULES + WIREGUARD-MODULE + KSMBD-MODULE + NTFS3-MODULE) replaces=() conflicts=() cd linux-${_major} - local kernver="$(<version)" - local modulesdir="$pkgdir/usr/lib/modules/$kernver" + local modulesdir="$pkgdir/usr/lib/modules/$(<version)" msg2 "Installing boot image..." # systemd expects to find the kernel here to allow hibernation @@ -274,10 +301,11 @@ _package() { echo "${pkgver}-${pkgrel}-Manjaro-Xanmod x64" | install -Dm644 /dev/stdin "${pkgdir}/boot/${pkgbase}.kver" msg2 "Installing modules..." - make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install + ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \ + DEPMOD=/doesnt/exist modules_install # Suppress depmod - # remove build and source links - rm "$modulesdir"/{source,build} + # remove build link + rm "$modulesdir"/build } _package-headers() { @@ -297,11 +325,11 @@ _package-headers() { install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile cp -t "$builddir" -a scripts - # add objtool for external module building and enabled VALIDATION_STACK option + # required when STACK_VALIDATION is enabled install -Dt "$builddir/tools/objtool" tools/objtool/objtool - # add xfs and shmem for aufs building - mkdir -p "$builddir"/{fs/xfs,mm} + # required when DEBUG_INFO_BTF_MODULES is enabled + if [ -f "tools/bpf/resolve_btfids/resolve_btfids" ]; then install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids ; fi msg2 "Installing headers..." cp -t "$builddir" -a include @@ -311,13 +339,16 @@ _package-headers() { install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h - # http://bugs.archlinux.org/task/13146 + # https://bugs.archlinux.org/task/13146 install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h - # http://bugs.archlinux.org/task/20402 + # https://bugs.archlinux.org/task/20402 install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h + + # https://bugs.archlinux.org/task/71392 + install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h msg2 "Installing KConfig files..." find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \; @@ -342,7 +373,7 @@ _package-headers() { msg2 "Stripping build tools..." local file while read -rd '' file; do - case "$(file -bi "$file")" in + case "$(file -Sib "$file")" in application/x-sharedlib\;*) # Libraries (.so) strip -v $STRIP_SHARED "$file" ;; application/x-archive\;*) # Libraries (.a) |