diff options
| author | Mikael Eriksson | 2024-05-27 02:31:33 +0200 |
|---|---|---|
| committer | Mikael Eriksson | 2024-05-27 02:32:14 +0200 |
| commit | 0a0683cfcac76e2e60eca1fff760bb543b8f044d (patch) | |
| tree | 1e6fd11fb0e06c707d6670e16728750f7943e31a /PKGBUILD | |
| parent | d522ac6606c1beb82f0d12835e6d9a9499e313e3 (diff) | |
| download | aur-0a0683cfcac76e2e60eca1fff760bb543b8f044d.tar.gz | |
Merge with core/linux 6.9.2.arch1-1
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 46 |
1 files changed, 21 insertions, 25 deletions
@@ -33,8 +33,8 @@ makedepends=( texlive-latexextra ) options=( - !strip !debug + !strip ) _srcname=linux-mainline source=( @@ -42,36 +42,29 @@ source=( config # the main kernel config file ) validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman - 'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig) + ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds + 647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman + 83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig) ) -sha256sums=('SKIP' - 'c2b00c84c4b543db431e06604d939a62f93107d18369f4d9860dc8062b01ab45') +sha256sums=('0ac1ad026d8eba3a745239e50259b8c4b78892b3c30d742cb1ed5b6988512519' + 'bf33bb233f852dd27cd9970c348987aa32325d695c22e7a793f4dfbd8fd6dc4c') 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="$(<version)" "$@" -} - prepare() { cd $_srcname echo "Setting version..." echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname - make defconfig - make -s kernelrelease > version - make mrproper local src for src in "${source[@]}"; do src="${src%%::*}" src="${src##*/}" + src="${src%.zst}" [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -79,17 +72,18 @@ prepare() { echo "Setting config..." cp ../config .config - _make olddefconfig + make olddefconfig diff -u ../config .config || : + make -s kernelrelease > version echo "Prepared $pkgbase version $(<version)" } build() { cd $_srcname - _make all -# Disabled for now, fails since python 3.12 with AttributeError: module 'docutils.nodes' has no attribute 'reprunicode' -#_make htmldocs + make all + make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + make htmldocs } _package() { @@ -108,6 +102,10 @@ _package() { VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE ) + replaces=( + virtualbox-guest-modules-arch + wireguard-arch + ) cd $_srcname local modulesdir="$pkgdir/usr/lib/modules/$(<version)" @@ -115,17 +113,17 @@ _package() { echo "Installing boot image..." # systemd expects to find the kernel here to allow hibernation # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 - install -Dm644 "$(_make -s image_name)" "$modulesdir/vmlinuz" + install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz" # Used by mkinitcpio to name the kernel echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase" echo "Installing modules..." - ZSTD_CLEVEL=19 _make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \ + 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 -f "$modulesdir"/{source,build} + # remove build link + rm "$modulesdir"/build } _package-headers() { @@ -137,7 +135,7 @@ _package-headers() { echo "Installing build files..." install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \ - localversion.* version vmlinux + localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h install -Dt "$builddir/kernel" -m644 kernel/Makefile install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile cp -t "$builddir" -a scripts @@ -212,8 +210,6 @@ _package-headers() { _package-docs() { pkgdesc="Documentation for the $pkgdesc kernel" - return # Disabled - cd $_srcname local builddir="$pkgdir/usr/lib/modules/$(<version)/build" |