diff --git a/.gitignore b/.gitignore index 33c98cc..27fd112 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -*.tar.xz +src/ +pkg/ *.tar.gz -*.tar.zst -*.sig -*.log diff --git a/PKGBUILD b/PKGBUILD index c31b471..a19788a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,10 +1,12 @@ # Maintainer: Jan Houben # Contributor: Jesus Alvarez # -# This PKGBUILD was generated by the archzfs build scripts located at +# This PKGBUILD was originally generated by the archzfs build scripts located at # # http://github.com/archzfs/archzfs # +# Updates are currently manual +# # ! WARNING ! # # The archzfs packages are kernel modules, so these PKGBUILDS will only work with the kernel package they target. In this @@ -17,12 +19,11 @@ # pkgbase="zfs-linux-hardened" pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers") -_zfsver="2.3.2" -_kernelver="6.13.12.hardened1-2" -_kernelver_full="6.13.12.hardened1-2" -_extramodules="${_kernelver/.hardened/-hardened}-hardened" -pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)" +pkgver="2.3.2_6.13.12.hardened1.2" +_zfsver="$(echo "$pkgver" | sed 's/_.*$//')" +_kernelver="$(echo "$pkgver" | sed 's/^.*_\(.*\)\.\([0-9]*\)$/\1-\2/')" +_extramodules="${_kernelver/.hardened/-hardened}-hardened" pkgrel=1 makedepends=("linux-hardened-headers=${_kernelver}") arch=("x86_64") @@ -32,6 +33,11 @@ sha256sums=('80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a') license=("CDDL") depends=("kmod" "zfs-utils=${_zfsver}" "linux-hardened=${_kernelver}") +pkgver() { + echo -n "${_zfsver}_" + pacman -Si linux-hardened | sed -n 's/Version *: *\(.*\)-\([0-9]*\)/\1.\2/p' +} + build() { cd "${srcdir}/zfs-${_zfsver}" ./autogen.sh