diff --git a/src/kernels/archiso.sh b/src/kernels/archiso.sh index cded555..4b2e0e7 100644 --- a/src/kernels/archiso.sh +++ b/src/kernels/archiso.sh @@ -42,7 +42,6 @@ update_archiso_linux_pkgbuilds() { zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} spl_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel} - spl_utils_pkgname="spl-utils=${zol_version}" spl_pkgname="spl-archiso-linux" zfs_utils_pkgname="zfs-utils=${zol_version}" zfs_pkgname="zfs-archiso-linux" diff --git a/src/kernels/dkms.sh b/src/kernels/dkms.sh index 003fa52..a5a775f 100644 --- a/src/kernels/dkms.sh +++ b/src/kernels/dkms.sh @@ -3,7 +3,7 @@ mode_name="dkms" mode_desc="Select and use the dkms packages" # version -pkgrel="2" +pkgrel="3" # Version for GIT packages pkgrel_git="1" @@ -32,7 +32,6 @@ update_dkms_pkgbuilds() { zfs_pkgrel=${pkgrel} spl_pkgname="spl-dkms" zfs_pkgname="zfs-dkms" - spl_utils_pkgname="spl-utils=\${pkgver}" zfs_utils_pkgname="zfs-utils=\${pkgver}" # Paths are relative to build.sh spl_dkms_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" diff --git a/src/kernels/linux-hardened.sh b/src/kernels/linux-hardened.sh index 9751512..2093dd7 100644 --- a/src/kernels/linux-hardened.sh +++ b/src/kernels/linux-hardened.sh @@ -4,7 +4,7 @@ package_base="linux-hardened" mode_desc="Select and use the packages for the linux-hardened kernel" # pkgrel for hardened packages -pkgrel="2" +pkgrel="3" # pkgrel for GIT packages pkgrel_git="1" @@ -57,7 +57,6 @@ update_linux_hardened_pkgbuilds() { spl_conflicts="'spl-linux-hardened-git'" zfs_conflicts="'zfs-linux-hardened-git'" spl_pkgname="spl-linux-hardened" - spl_utils_pkgname="spl-utils=\${_splver}" zfs_pkgname="zfs-linux-hardened" zfs_utils_pkgname="zfs-utils=\${_zfsver}" # Paths are relative to build.sh diff --git a/src/kernels/linux-lts.sh b/src/kernels/linux-lts.sh index f4d3224..1209d49 100644 --- a/src/kernels/linux-lts.sh +++ b/src/kernels/linux-lts.sh @@ -4,7 +4,7 @@ package_base="linux-lts" mode_desc="Select and use the packages for the linux-lts kernel" # pkgrel for LTS packages -pkgrel="2" +pkgrel="3" # pkgrel for GIT packages pkgrel_git="1" @@ -57,7 +57,6 @@ update_linux_lts_pkgbuilds() { spl_conflicts="'spl-linux-lts-git'" zfs_conflicts="'zfs-linux-lts-git'" spl_pkgname="spl-linux-lts" - spl_utils_pkgname="spl-utils=\${_splver}" zfs_pkgname="zfs-linux-lts" zfs_utils_pkgname="zfs-utils=\${_zfsver}" # Paths are relative to build.sh diff --git a/src/kernels/linux-vfio.sh b/src/kernels/linux-vfio.sh index 12d0b1f..53952b8 100644 --- a/src/kernels/linux-vfio.sh +++ b/src/kernels/linux-vfio.sh @@ -4,7 +4,7 @@ package_base="linux-vfio" mode_desc="Select and use the packages for the linux-vfio kernel" # pkgrel for vfio packages -pkgrel="2" +pkgrel="3" # pkgrel for GIT packages pkgrel_git="1" @@ -57,7 +57,6 @@ update_linux_vfio_pkgbuilds() { spl_conflicts="'spl-linux-vfio-git'" zfs_conflicts="'zfs-linux-vfio-git'" spl_pkgname="spl-linux-vfio" - spl_utils_pkgname="spl-utils=\${_splver}" zfs_pkgname="zfs-linux-vfio" zfs_utils_pkgname="zfs-utils=\${_zfsver}" # Paths are relative to build.sh diff --git a/src/kernels/linux-zen.sh b/src/kernels/linux-zen.sh index ad25a71..3720769 100644 --- a/src/kernels/linux-zen.sh +++ b/src/kernels/linux-zen.sh @@ -4,7 +4,7 @@ package_base="linux-zen" mode_desc="Select and use the packages for the linux-zen kernel" # pkgrel for ZEN packages -pkgrel="2" +pkgrel="3" # pkgrel for GIT packages pkgrel_git="1" @@ -57,7 +57,6 @@ update_linux_zen_pkgbuilds() { spl_conflicts="'spl-linux-zen-git'" zfs_conflicts="'zfs-linux-zen-git'" spl_pkgname="spl-linux-zen" - spl_utils_pkgname="spl-utils=\${_splver}" zfs_pkgname="zfs-linux-zen" zfs_utils_pkgname="zfs-utils=\${_zfsver}" # Paths are relative to build.sh diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh index 6373b9c..1f00ef7 100644 --- a/src/kernels/linux.sh +++ b/src/kernels/linux.sh @@ -4,7 +4,7 @@ package_base="linux" mode_desc="Select and use the packages for the default linux kernel" # pkgrel for default ZFS packages -pkgrel="2" +pkgrel="3" # pkgrel for GIT packages pkgrel_git="1" @@ -57,7 +57,6 @@ update_linux_pkgbuilds() { spl_conflicts="'spl-linux-git'" zfs_conflicts="'zfs-linux-git'" spl_pkgname="spl-linux" - spl_utils_pkgname="spl-utils=\${_splver}" zfs_pkgname="zfs-linux" zfs_utils_pkgname="zfs-utils=\${_zfsver}" # Paths are relative to build.sh diff --git a/src/spl-dkms/PKGBUILD.sh b/src/spl-dkms/PKGBUILD.sh index 2021efc..972654f 100755 --- a/src/spl-dkms/PKGBUILD.sh +++ b/src/spl-dkms/PKGBUILD.sh @@ -12,7 +12,7 @@ url="http://zfsonlinux.org/" source=("${spl_src_target}") sha256sums=("${spl_src_hash}") license=("GPL") -depends=("${spl_utils_pkgname}" "dkms") +depends=("dkms") provides=("spl" "spl-headers") groups=("${archzfs_package_group}") conflicts=("spl" "spl-headers") diff --git a/src/spl/PKGBUILD.sh b/src/spl/PKGBUILD.sh index 22ad26c..d28a988 100755 --- a/src/spl/PKGBUILD.sh +++ b/src/spl/PKGBUILD.sh @@ -17,7 +17,7 @@ url="http://zfsonlinux.org/" source=("${spl_src_target}") sha256sums=("${spl_src_hash}") license=("GPL") -depends=("${spl_utils_pkgname}" "kmod" ${linux_depends}) +depends=("kmod" ${linux_depends}) build() { cd "${spl_workdir}"