diff --git a/src/kernels/archiso.sh b/src/kernels/archiso.sh index 8851506..334220c 100644 --- a/src/kernels/archiso.sh +++ b/src/kernels/archiso.sh @@ -47,7 +47,7 @@ update_archiso_linux_pkgbuilds() { zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" spl_workdir="\${srcdir}/spl-${zol_version}" zfs_workdir="\${srcdir}/zfs-${zol_version}" - linux_depends="\"linux=${kernel_version_major}\"" - linux_headers_depends="\"linux-headers=${kernel_version_major}\"" + linux_depends="\"linux=${kernel_version}\"" + linux_headers_depends="\"linux-headers=${kernel_version}\"" zfs_makedepends="\"${spl_pkgname}-headers\"" } diff --git a/src/kernels/linux-lts.sh b/src/kernels/linux-lts.sh index 5df5b18..1988d2d 100644 --- a/src/kernels/linux-lts.sh +++ b/src/kernels/linux-lts.sh @@ -58,8 +58,8 @@ update_linux_lts_pkgbuilds() { zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" spl_workdir="\${srcdir}/spl-${zol_version}" zfs_workdir="\${srcdir}/zfs-${zol_version}" - linux_depends="\"linux-lts=${kernel_version_major}\"" - linux_headers_depends="\"linux-lts-headers=${kernel_version_major}\"" + linux_depends="\"linux-lts=${kernel_version}\"" + linux_headers_depends="\"linux-lts-headers=${kernel_version}\"" spl_makedepends="\"libelf\"" zfs_makedepends="\"libelf\" \"${spl_pkgname}-headers\"" } @@ -84,8 +84,8 @@ update_linux_lts_git_pkgbuilds() { zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" spl_src_target="git+${spl_git_url}" spl_src_hash="SKIP" - linux_depends="\"linux-lts=${kernel_version_full}\"" - linux_headers_depends="\"linux-lts-headers=${kernel_version_full}\"" + linux_depends="\"linux-lts=${kernel_version}\"" + linux_headers_depends="\"linux-lts-headers=${kernel_version}\"" spl_makedepends="\"libelf\" \"git\"" zfs_src_target="git+${zfs_git_url}" zfs_src_hash="SKIP" diff --git a/src/kernels/linux-vfio.sh b/src/kernels/linux-vfio.sh index aa68496..b3a86e8 100644 --- a/src/kernels/linux-vfio.sh +++ b/src/kernels/linux-vfio.sh @@ -57,8 +57,8 @@ update_linux_pkgbuilds() { zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" spl_workdir="\${srcdir}/spl-${zol_version}" zfs_workdir="\${srcdir}/zfs-${zol_version}" - linux_depends="\"linux-vfio=${kernel_version_full}\"" - linux_headers_depends="\"linux-vfio-headers=${kernel_version_full}\"" + linux_depends="\"linux-vfio=${kernel_version}\"" + linux_headers_depends="\"linux-vfio-headers=${kernel_version}\"" zfs_makedepends="\"${spl_pkgname}-headers\"" } @@ -85,8 +85,8 @@ update_linux_git_pkgbuilds() { spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}" fi spl_src_hash="SKIP" - linux_depends="\"linux-vfio=${kernel_version_full}\"" - linux_headers_depends="\"linux-vfio-headers=${kernel_version_full}\"" + linux_depends="\"linux-vfio=${kernel_version}\"" + linux_headers_depends="\"linux-vfio-headers=${kernel_version}\"" spl_makedepends="\"git\"" zfs_src_target="git+${zfs_git_url}" if [[ ${zfs_git_commit} != "" ]]; then diff --git a/src/kernels/linux-zen.sh b/src/kernels/linux-zen.sh index 3fe6471..0739c1a 100644 --- a/src/kernels/linux-zen.sh +++ b/src/kernels/linux-zen.sh @@ -57,8 +57,8 @@ update_linux_pkgbuilds() { zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" spl_workdir="\${srcdir}/spl-${zol_version}" zfs_workdir="\${srcdir}/zfs-${zol_version}" - linux_depends="\"linux-zen=${kernel_version_full}\"" - linux_headers_depends="\"linux-zen-headers=${kernel_version_full}\"" + linux_depends="\"linux-zen=${kernel_version}\"" + linux_headers_depends="\"linux-zen-headers=${kernel_version}\"" zfs_makedepends="\"${spl_pkgname}-headers\"" } @@ -82,8 +82,8 @@ update_linux_git_pkgbuilds() { zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" spl_src_target="git+${spl_git_url}" spl_src_hash="SKIP" - linux_depends="\"linux-zen=${kernel_version_full}\"" - linux_headers_depends="\"linux-zen-headers=${kernel_version_full}\"" + linux_depends="\"linux-zen=${kernel_version}\"" + linux_headers_depends="\"linux-zen-headers=${kernel_version}\"" spl_makedepends="\"git\"" zfs_src_target="git+${zfs_git_url}" zfs_src_hash="SKIP" diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh index 0b2c3a7..458526f 100644 --- a/src/kernels/linux.sh +++ b/src/kernels/linux.sh @@ -57,8 +57,8 @@ update_linux_pkgbuilds() { zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" spl_workdir="\${srcdir}/spl-${zol_version}" zfs_workdir="\${srcdir}/zfs-${zol_version}" - linux_depends="\"linux=${kernel_version_full}\"" - linux_headers_depends="\"linux-headers=${kernel_version_full}\"" + linux_depends="\"linux=${kernel_version}\"" + linux_headers_depends="\"linux-headers=${kernel_version}\"" spl_replaces='replaces=("spl-git")' zfs_replaces='replaces=("zfs-git")' zfs_makedepends="\"${spl_pkgname}-headers\"" @@ -84,8 +84,8 @@ update_linux_git_pkgbuilds() { zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" spl_src_target="git+${spl_git_url}" spl_src_hash="SKIP" - linux_depends="\"linux=${kernel_version_full}\"" - linux_headers_depends="\"linux-headers=${kernel_version_full}\"" + linux_depends="\"linux=${kernel_version}\"" + linux_headers_depends="\"linux-headers=${kernel_version}\"" spl_makedepends="\"git\"" zfs_src_target="git+${zfs_git_url}"