From 20aee968d942212c86263f80e7217333235bcd83 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Tue, 14 Feb 2023 21:09:28 +0100 Subject: Bumped version. --- PKGBUILD | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index 171e4df..e0f3d09 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=linux-kentdobias -_kver=6.1.10.arch1 +_kver=6.1.12.kd1 _zver=2.1.9 pkgver="${_kver}_${_zver}" pkgrel=2 @@ -12,7 +12,6 @@ arch=(x86_64) license=(GPL2) makedepends=( bc libelf pahole cpio perl tar xz gettext - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra git ) options=('!strip') @@ -31,7 +30,7 @@ validpgpkeys=( ) sha256sums=('SKIP' '6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6' - '50b856cca87cb2ca9a2e19d3752df64b9423591264e4f6ad1cca731a526d8c63') + '73a01984e18525288b5ada418878172ae514a1888c0bc3ff2598487e864f3754') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -40,17 +39,7 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP _make='make LLVM=1' prepare() { - cd zfs-${_zver} - ./autogen.sh - KERNEL_LLVM=1 CC=clang ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \ - --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \ - --with-udevdir=/usr/lib/udev --libexecdir=/usr/lib \ - --enable-systemd --enable-pyzfs \ - --with-zfsexecdir=/usr/lib/zfs --localstatedir=/var \ - --enable-linux-builtin --with-linux=../$_srcname - ./copy-builtin ../$_srcname - - cd ../$_srcname + cd $_srcname echo "Setting version..." scripts/setlocalversion --save-scmversion @@ -66,6 +55,22 @@ prepare() { patch -Np1 < "../$src" done + echo "Setting config..." + cp ../config .config + $_make prepare + + cd ../zfs-${_zver} + ./autogen.sh + KERNEL_LLVM=1 CC=clang ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \ + --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \ + --with-udevdir=/usr/lib/udev --libexecdir=/usr/lib \ + --enable-systemd --enable-pyzfs \ + --with-zfsexecdir=/usr/lib/zfs --localstatedir=/var \ + --enable-linux-builtin --with-linux=../$_srcname + ./copy-builtin ../$_srcname + + cd ../$_srcname + echo "Setting config..." cp ../config .config $_make olddefconfig @@ -190,7 +195,7 @@ _package-headers() { ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" } -pkgname=("$pkgbase" "$pkgbase-headers") +pkgname=("$pkgbase") for _p in "${pkgname[@]}"; do eval "package_$_p() { $(declare -f "_package${_p#$pkgbase}") -- cgit v1.2.3-70-g09d2