Skip to content

Commit

Permalink
Update zfs version to 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@minextu
minextu committed Dec 2, 2020
1 parent 772be2c commit 069795e
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions conf.sh
View file
Expand Up @@ -2,11 +2,11 @@
#
# FIXME: reset all kernel configs set to pkgrel=1 when this changes
#
zol_version="0.8.5"
zol_version="2.0.0"
zol_rc_version="2.0.0-rc7"

# The ZOL source hashes are from zfsonlinux.org
zfs_src_hash="dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d"
zfs_src_hash="3403bf8e993f3c9d772f768142117df47bdbbb8e9bbf85a29c0e166f577f9311"
zfs_rc_src_hash="640fde2b678040c9511172bf3b7ffc444d8e8daa1d738f4687f1ad92d6d01e7b"

zfs_initcpio_install_hash="29a8a6d76fff01b71ef1990526785405d9c9410bdea417b08b56107210d00b10"
Expand Down
26 changes: 13 additions & 13 deletions src/kernels/_utils.sh
View file
Expand Up @@ -3,7 +3,7 @@ mode_name="utils"
mode_desc="Select and use the utils packages"

# version
pkgrel="5"
pkgrel="1"

# Version for GIT packages
pkgrel_git="1"
Expand Down Expand Up @@ -35,18 +35,18 @@ update_utils_pkgbuilds() {
zfs_utils_replaces='replaces=("zfs-utils-linux" "zfs-utils-linux-lts" "zfs-utils-common")'
}

update_utils_rc_pkgbuilds() {
pkg_list=("zfs-utils-rc")
archzfs_package_group="archzfs-linux-rc"
zfs_pkgver=${zol_rc_version/-/_}
zfs_pkgrel=${pkgrel_rc}
zfs_utils_pkgname="zfs-utils-rc"
zfs_src_hash=${zfs_rc_src_hash}
# Paths are relative to build.sh
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-\${pkgver/_/-}/zfs-\${pkgver/_/-}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${pkgver/_rc*/}"
}
# update_utils_rc_pkgbuilds() {
# pkg_list=("zfs-utils-rc")
# archzfs_package_group="archzfs-linux-rc"
# zfs_pkgver=${zol_rc_version/-/_}
# zfs_pkgrel=${pkgrel_rc}
# zfs_utils_pkgname="zfs-utils-rc"
# zfs_src_hash=${zfs_rc_src_hash}
# Paths are relative to build.sh
# zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
# zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-\${pkgver/_/-}/zfs-\${pkgver/_/-}.tar.gz"
# zfs_workdir="\${srcdir}/zfs-\${pkgver/_rc*/}"
# }

update_utils_git_pkgbuilds() {
pkg_list=("zfs-utils-git")
Expand Down
28 changes: 14 additions & 14 deletions src/kernels/dkms.sh
View file
Expand Up @@ -37,20 +37,20 @@ update_dkms_pkgbuilds() {
zfs_replaces='replaces=("spl-dkms")'
}

update_dkms_rc_pkgbuilds() {
pkg_list=("zfs-dkms-rc")
archzfs_package_group="archzfs-dkms-rc"
zfs_pkgver=${zol_rc_version/-/_}
zfs_mod_ver="\${pkgver}"
zfs_pkgrel=${pkgrel_rc}
zfs_pkgname="zfs-dkms-rc"
zfs_utils_pkgname="zfs-utils-rc=\${pkgver}"
zfs_src_hash=${zfs_rc_src_hash}
# Paths are relative to build.sh
zfs_dkms_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-\${pkgver/_/-}/zfs-\${pkgver/_/-}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${pkgver/_rc*/}"
}
# update_dkms_rc_pkgbuilds() {
# pkg_list=("zfs-dkms-rc")
# archzfs_package_group="archzfs-dkms-rc"
# zfs_pkgver=${zol_rc_version/-/_}
# zfs_mod_ver="\${pkgver}"
# zfs_pkgrel=${pkgrel_rc}
# zfs_pkgname="zfs-dkms-rc"
# zfs_utils_pkgname="zfs-utils-rc=\${pkgver}"
# zfs_src_hash=${zfs_rc_src_hash}
# Paths are relative to build.sh
# zfs_dkms_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
# zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-\${pkgver/_/-}/zfs-\${pkgver/_/-}.tar.gz"
# zfs_workdir="\${srcdir}/zfs-\${pkgver/_rc*/}"
# }

update_dkms_git_pkgbuilds() {
pkg_list=("zfs-dkms-git")
Expand Down
30 changes: 15 additions & 15 deletions src/kernels/linux-lts.sh
View file
Expand Up @@ -63,21 +63,21 @@ update_linux_lts_pkgbuilds() {
zfs_replaces='replaces=("spl-linux-lts")'
}

update_linux_lts_rc_pkgbuilds() {
get_kernel_options
pkg_list=("zfs-linux-lts-rc")
archzfs_package_group="archzfs-linux-lts-rc"
zfs_pkgver=${zol_rc_version/-/_}
zfs_pkgrel=${pkgrel_rc}
zfs_conflicts="'zfs-linux-lts' 'zfs-linux-lts-git' 'spl-linux-lts'"
zfs_pkgname="zfs-linux-lts-rc"
zfs_utils_pkgname="zfs-utils-rc=\${_zfsver}"
zfs_src_hash=${zfs_rc_src_hash}
# Paths are relative to build.sh
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-\${_zfsver/_/-}/zfs-\${_zfsver/_/-}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${_zfsver/_rc*/}"
}
# update_linux_lts_rc_pkgbuilds() {
# get_kernel_options
# pkg_list=("zfs-linux-lts-rc")
# archzfs_package_group="archzfs-linux-lts-rc"
# zfs_pkgver=${zol_rc_version/-/_}
# zfs_pkgrel=${pkgrel_rc}
# zfs_conflicts="'zfs-linux-lts' 'zfs-linux-lts-git' 'spl-linux-lts'"
# zfs_pkgname="zfs-linux-lts-rc"
# zfs_utils_pkgname="zfs-utils-rc=\${_zfsver}"
# zfs_src_hash=${zfs_rc_src_hash}
# Paths are relative to build.sh
# zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
# zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-\${_zfsver/_/-}/zfs-\${_zfsver/_/-}.tar.gz"
# zfs_workdir="\${srcdir}/zfs-\${_zfsver/_rc*/}"
# }

update_linux_lts_git_pkgbuilds() {
get_kernel_options
Expand Down
30 changes: 15 additions & 15 deletions src/kernels/linux.sh
View file
Expand Up @@ -65,21 +65,21 @@ update_linux_pkgbuilds() {
}


update_linux_rc_pkgbuilds() {
get_kernel_options
pkg_list=("zfs-linux-rc")
archzfs_package_group="archzfs-linux-rc"
zfs_pkgver=${zol_rc_version/-/_}
zfs_pkgrel=${pkgrel_rc}
zfs_conflicts="'zfs-linux' 'zfs-linux-git' 'spl-linux'"
zfs_pkgname="zfs-linux-rc"
zfs_utils_pkgname="zfs-utils-rc=\${_zfsver}"
zfs_src_hash=${zfs_rc_src_hash}
# Paths are relative to build.sh
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-\${_zfsver/_/-}/zfs-\${_zfsver/_/-}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${_zfsver/_rc*/}"
}
# update_linux_rc_pkgbuilds() {
# get_kernel_options
# pkg_list=("zfs-linux-rc")
# archzfs_package_group="archzfs-linux-rc"
# zfs_pkgver=${zol_rc_version/-/_}
# zfs_pkgrel=${pkgrel_rc}
# zfs_conflicts="'zfs-linux' 'zfs-linux-git' 'spl-linux'"
# zfs_pkgname="zfs-linux-rc"
# zfs_utils_pkgname="zfs-utils-rc=\${_zfsver}"
# zfs_src_hash=${zfs_rc_src_hash}
# Paths are relative to build.sh
# zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
# zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-\${_zfsver/_/-}/zfs-\${_zfsver/_/-}.tar.gz"
# zfs_workdir="\${srcdir}/zfs-\${_zfsver/_rc*/}"
# }

update_linux_git_pkgbuilds() {
get_kernel_options
Expand Down

0 comments on commit 069795e

Please sign in to comment.