diff --git a/PKGBUILD b/PKGBUILD index 1137b80..7c6d29f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=linux-eirene -pkgver=6.2.12.arch1 +pkgver=6.3.7.arch1 pkgrel=1 pkgdesc='Linux' _srctag=v${pkgver%.*}-${pkgver##*.} @@ -9,42 +9,55 @@ url="https://github.com/archlinux/linux/commits/$_srctag" arch=(x86_64) license=(GPL2) makedepends=( - bc libelf pahole cpio perl tar xz gettext - xmlto python-sphinx graphviz imagemagick texlive-latexextra + bc + cpio + gettext git + libelf + pahole + perl + tar + xz ) options=('!strip') _srcname=archlinux-linux source=( "$_srcname::git+https://github.com/archlinux/linux?signed#tag=$_srctag" - config # the main kernel config file + config # the main kernel config file 0001-add-acs-overrides.patch 0002-i915-vga-arbiter.patch 0003-skip-pat-check.patch ) validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman - 'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig) - 'C7E7849466FE2358343588377258734B41C31549' # David Runge + ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds + 647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman + A2FF3A36AAA56654109064AB19802F8B0D70FC30 # Jan Alexander Steffens (heftig) + C7E7849466FE2358343588377258734B41C31549 # David Runge ) -sha256sums=('SKIP' - 'c16920da137fc99ad5ec379d9be60546fc2c50fd9fbbb506d944f012d11b032d' - 'd61f77fad364ca02b14d04ace86c149c40350db4c803e5a5045139fa7eede2cb' - '750c57539f17332cafe01a978a0133fc9500dbe37a411b823dad2eee66652cfc' - 'd37258e84eb1d55c6206300acfc5f12ca4f97aa2e9d9f7cd446451428f7dc1b6') +b2sums=('SKIP' + 'beea0cef92dc09eaa818354fd5e3a30ad9b9426c7ec6966a5011fd3471b709494408ab616fbd1e1c3c9819484c554a297a26b197c8c2cf50114c0cc9d392b33c' + '08f8a109cc4ddd1625c272d6b4eddd47a9c7b676bd2a94053301f969659fdbd30a3749527088bf4246f4e6962d8d8f75ad5895ff11c69792068f196aff1c4bae' + '6628cbee66acd3b821661ad5ffb046dfffe04f2024c872e8dd2b429f038feead0ebe4a42bfd39f4830975861d70fa32de684841f6d8352b6dbf2f722b41b5b88' + 'f6652b62dc20932aff69b3f0fc8cfc30a0ac9ce6a16f4365576bfef10c0da7a2a357496a94ea54f2f6da2e33ec9a53f375fa2a8391586b3648f94e684e45cc61') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" +_make() { + test -s version + make KERNELRELEASE="$( localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname + make defconfig + make -s kernelrelease > version + make mrproper local src for src in "${source[@]}"; do @@ -57,10 +70,27 @@ prepare() { echo "Setting config..." cp ../config .config - make olddefconfig + + sed -i 's/CONFIG_BUILD_SALT=""/CONFIG_BUILD_SALT="-eirene"/' .config + sed -i 's/CONFIG_DEFAULT_HOSTNAME="archlinux"/CONFIG_DEFAULT_HOSTNAME="eirene"/' .config + + sed -i 's/# CONFIG_KERNEL_LZ4 is not set/CONFIG_KERNEL_LZ4=y/' .config + sed -i 's/CONFIG_KERNEL_ZSTD=y/# CONFIG_KERNEL_ZSTD is not set/' .config + + sed -i 's/CONFIG_MODULE_COMPRESS_ZSTD=y/# CONFIG_MODULE_COMPRESS_ZSTD is not set/' .config + sed -i 's/CONFIG_MODULE_DECOMPRESS=y/# CONFIG_MODULE_DECOMPRESS is not set/' .config + sed -i 's/# CONFIG_MODULE_COMPRESS_NONE is not set/CONFIG_MODULE_COMPRESS_NONE=y/' .config + + sed -i 's/CONFIG_GENERIC_CPU=y/# CONFIG_GENERIC_CPU is not set/' .config + sed -i 's/# CONFIG_MK8 is not set/CONFIG_MK8=y/' .config + + sed -i 's/CONFIG_NR_CPUS=320/CONFIG_NR_CPUS=16/' .config + + sed -i 's/# CONFIG_LIVEPATCH is not set/CONFIG_LIVEPATCH=y/' .config + + _make olddefconfig diff -u ../config .config || : - make -s kernelrelease > version echo "Prepared $pkgbase version $( pkgbase=linux -pkgver=6.2.12.arch1 +pkgver=6.3.7.arch1 pkgrel=1 pkgdesc='Linux' _srctag=v${pkgver%.*}-${pkgver##*.} @@ -9,36 +9,55 @@ url="https://github.com/archlinux/linux/commits/$_srctag" arch=(x86_64) license=(GPL2) makedepends=( - bc libelf pahole cpio perl tar xz gettext - xmlto python-sphinx graphviz imagemagick texlive-latexextra + bc + cpio + gettext git + libelf + pahole + perl + tar + xz + + # htmldocs + graphviz + imagemagick + python-sphinx + texlive-latexextra ) options=('!strip') _srcname=archlinux-linux source=( "$_srcname::git+https://github.com/archlinux/linux?signed#tag=$_srctag" - config # the main kernel config file + config # the main kernel config file ) validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman - 'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig) - 'C7E7849466FE2358343588377258734B41C31549' # David Runge + ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds + 647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman + A2FF3A36AAA56654109064AB19802F8B0D70FC30 # Jan Alexander Steffens (heftig) + C7E7849466FE2358343588377258734B41C31549 # David Runge ) -sha256sums=('SKIP' - 'c8b3fbb7664801bebc2d2d1fdf624524865a7817d0021c55c98523cb58dee201') +b2sums=('SKIP' + 'beea0cef92dc09eaa818354fd5e3a30ad9b9426c7ec6966a5011fd3471b709494408ab616fbd1e1c3c9819484c554a297a26b197c8c2cf50114c0cc9d392b33c') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" +_make() { + test -s version + make KERNELRELEASE="$( localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname + make defconfig + make -s kernelrelease > version + make mrproper local src for src in "${source[@]}"; do @@ -51,40 +70,51 @@ prepare() { echo "Setting config..." cp ../config .config - make olddefconfig + _make olddefconfig diff -u ../config .config || : - make -s kernelrelease > version echo "Prepared $pkgbase version $(