Remove spl-utils dependency

pull/276/head
Jan Houben 6 years ago
parent af35099435
commit 81c5462db1
No known key found for this signature in database
GPG Key ID: 6866AADB974DD983
  1. 1
      src/kernels/archiso.sh
  2. 3
      src/kernels/dkms.sh
  3. 3
      src/kernels/linux-hardened.sh
  4. 3
      src/kernels/linux-lts.sh
  5. 3
      src/kernels/linux-vfio.sh
  6. 3
      src/kernels/linux-zen.sh
  7. 3
      src/kernels/linux.sh
  8. 2
      src/spl-dkms/PKGBUILD.sh
  9. 2
      src/spl/PKGBUILD.sh

@ -42,7 +42,6 @@ update_archiso_linux_pkgbuilds() {
zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
spl_pkgrel=${pkgrel} spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel}
spl_utils_pkgname="spl-utils=${zol_version}"
spl_pkgname="spl-archiso-linux" spl_pkgname="spl-archiso-linux"
zfs_utils_pkgname="zfs-utils=${zol_version}" zfs_utils_pkgname="zfs-utils=${zol_version}"
zfs_pkgname="zfs-archiso-linux" zfs_pkgname="zfs-archiso-linux"

@ -3,7 +3,7 @@ mode_name="dkms"
mode_desc="Select and use the dkms packages" mode_desc="Select and use the dkms packages"
# version # version
pkgrel="2" pkgrel="3"
# Version for GIT packages # Version for GIT packages
pkgrel_git="1" pkgrel_git="1"
@ -32,7 +32,6 @@ update_dkms_pkgbuilds() {
zfs_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel}
spl_pkgname="spl-dkms" spl_pkgname="spl-dkms"
zfs_pkgname="zfs-dkms" zfs_pkgname="zfs-dkms"
spl_utils_pkgname="spl-utils=\${pkgver}"
zfs_utils_pkgname="zfs-utils=\${pkgver}" zfs_utils_pkgname="zfs-utils=\${pkgver}"
# Paths are relative to build.sh # Paths are relative to build.sh
spl_dkms_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_dkms_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"

@ -4,7 +4,7 @@ package_base="linux-hardened"
mode_desc="Select and use the packages for the linux-hardened kernel" mode_desc="Select and use the packages for the linux-hardened kernel"
# pkgrel for hardened packages # pkgrel for hardened packages
pkgrel="2" pkgrel="3"
# pkgrel for GIT packages # pkgrel for GIT packages
pkgrel_git="1" pkgrel_git="1"
@ -57,7 +57,6 @@ update_linux_hardened_pkgbuilds() {
spl_conflicts="'spl-linux-hardened-git'" spl_conflicts="'spl-linux-hardened-git'"
zfs_conflicts="'zfs-linux-hardened-git'" zfs_conflicts="'zfs-linux-hardened-git'"
spl_pkgname="spl-linux-hardened" spl_pkgname="spl-linux-hardened"
spl_utils_pkgname="spl-utils=\${_splver}"
zfs_pkgname="zfs-linux-hardened" zfs_pkgname="zfs-linux-hardened"
zfs_utils_pkgname="zfs-utils=\${_zfsver}" zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# Paths are relative to build.sh # Paths are relative to build.sh

@ -4,7 +4,7 @@ package_base="linux-lts"
mode_desc="Select and use the packages for the linux-lts kernel" mode_desc="Select and use the packages for the linux-lts kernel"
# pkgrel for LTS packages # pkgrel for LTS packages
pkgrel="2" pkgrel="3"
# pkgrel for GIT packages # pkgrel for GIT packages
pkgrel_git="1" pkgrel_git="1"
@ -57,7 +57,6 @@ update_linux_lts_pkgbuilds() {
spl_conflicts="'spl-linux-lts-git'" spl_conflicts="'spl-linux-lts-git'"
zfs_conflicts="'zfs-linux-lts-git'" zfs_conflicts="'zfs-linux-lts-git'"
spl_pkgname="spl-linux-lts" spl_pkgname="spl-linux-lts"
spl_utils_pkgname="spl-utils=\${_splver}"
zfs_pkgname="zfs-linux-lts" zfs_pkgname="zfs-linux-lts"
zfs_utils_pkgname="zfs-utils=\${_zfsver}" zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# Paths are relative to build.sh # Paths are relative to build.sh

@ -4,7 +4,7 @@ package_base="linux-vfio"
mode_desc="Select and use the packages for the linux-vfio kernel" mode_desc="Select and use the packages for the linux-vfio kernel"
# pkgrel for vfio packages # pkgrel for vfio packages
pkgrel="2" pkgrel="3"
# pkgrel for GIT packages # pkgrel for GIT packages
pkgrel_git="1" pkgrel_git="1"
@ -57,7 +57,6 @@ update_linux_vfio_pkgbuilds() {
spl_conflicts="'spl-linux-vfio-git'" spl_conflicts="'spl-linux-vfio-git'"
zfs_conflicts="'zfs-linux-vfio-git'" zfs_conflicts="'zfs-linux-vfio-git'"
spl_pkgname="spl-linux-vfio" spl_pkgname="spl-linux-vfio"
spl_utils_pkgname="spl-utils=\${_splver}"
zfs_pkgname="zfs-linux-vfio" zfs_pkgname="zfs-linux-vfio"
zfs_utils_pkgname="zfs-utils=\${_zfsver}" zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# Paths are relative to build.sh # Paths are relative to build.sh

@ -4,7 +4,7 @@ package_base="linux-zen"
mode_desc="Select and use the packages for the linux-zen kernel" mode_desc="Select and use the packages for the linux-zen kernel"
# pkgrel for ZEN packages # pkgrel for ZEN packages
pkgrel="2" pkgrel="3"
# pkgrel for GIT packages # pkgrel for GIT packages
pkgrel_git="1" pkgrel_git="1"
@ -57,7 +57,6 @@ update_linux_zen_pkgbuilds() {
spl_conflicts="'spl-linux-zen-git'" spl_conflicts="'spl-linux-zen-git'"
zfs_conflicts="'zfs-linux-zen-git'" zfs_conflicts="'zfs-linux-zen-git'"
spl_pkgname="spl-linux-zen" spl_pkgname="spl-linux-zen"
spl_utils_pkgname="spl-utils=\${_splver}"
zfs_pkgname="zfs-linux-zen" zfs_pkgname="zfs-linux-zen"
zfs_utils_pkgname="zfs-utils=\${_zfsver}" zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# Paths are relative to build.sh # Paths are relative to build.sh

@ -4,7 +4,7 @@ package_base="linux"
mode_desc="Select and use the packages for the default linux kernel" mode_desc="Select and use the packages for the default linux kernel"
# pkgrel for default ZFS packages # pkgrel for default ZFS packages
pkgrel="2" pkgrel="3"
# pkgrel for GIT packages # pkgrel for GIT packages
pkgrel_git="1" pkgrel_git="1"
@ -57,7 +57,6 @@ update_linux_pkgbuilds() {
spl_conflicts="'spl-linux-git'" spl_conflicts="'spl-linux-git'"
zfs_conflicts="'zfs-linux-git'" zfs_conflicts="'zfs-linux-git'"
spl_pkgname="spl-linux" spl_pkgname="spl-linux"
spl_utils_pkgname="spl-utils=\${_splver}"
zfs_pkgname="zfs-linux" zfs_pkgname="zfs-linux"
zfs_utils_pkgname="zfs-utils=\${_zfsver}" zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# Paths are relative to build.sh # Paths are relative to build.sh

@ -12,7 +12,7 @@ url="http://zfsonlinux.org/"
source=("${spl_src_target}") source=("${spl_src_target}")
sha256sums=("${spl_src_hash}") sha256sums=("${spl_src_hash}")
license=("GPL") license=("GPL")
depends=("${spl_utils_pkgname}" "dkms") depends=("dkms")
provides=("spl" "spl-headers") provides=("spl" "spl-headers")
groups=("${archzfs_package_group}") groups=("${archzfs_package_group}")
conflicts=("spl" "spl-headers") conflicts=("spl" "spl-headers")

@ -17,7 +17,7 @@ url="http://zfsonlinux.org/"
source=("${spl_src_target}") source=("${spl_src_target}")
sha256sums=("${spl_src_hash}") sha256sums=("${spl_src_hash}")
license=("GPL") license=("GPL")
depends=("${spl_utils_pkgname}" "kmod" ${linux_depends}) depends=("kmod" ${linux_depends})
build() { build() {
cd "${spl_workdir}" cd "${spl_workdir}"

Loading…
Cancel
Save