mirror
/
archzfs
mirror of https://github.com/archzfs/archzfs
2
0
Fork 0
Code Issues Releases Wiki Activity

Update zfs version to 2.1.0

Browse Source
pull/412/head
Jan Houben 4 years ago
parent 3c736d2af3
commit 7f5dea614e
No known key found for this signature in database
GPG Key ID: 22C69579E1123CE6
6 changed files with 60 additions and 58 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      conf.sh
  2. 2
      push.sh
  3. 24
      src/kernels/_utils.sh
  4. 28
      src/kernels/dkms.sh
  5. 30
      src/kernels/linux-lts.sh
  6. 30
      src/kernels/linux.sh

4
conf.sh
Unescape View File

@ -2,11 +2,11 @@
#
# FIXME: reset all kernel configs set to pkgrel=1 when this changes
#
zol_version="2.0.5"
zol_version="2.1.0"
zol_rc_version="2.1.0-rc8"
# The ZOL source hashes are from zfsonlinux.org
zfs_src_hash="3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9"
zfs_src_hash="60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f"
zfs_rc_src_hash="8627702ac841d38d5211001c76937e4097719c268b110e8836c0da195618fad2"
zfs_initcpio_install_hash="29a8a6d76fff01b71ef1990526785405d9c9410bdea417b08b56107210d00b10"

2
push.sh
Unescape View File

@ -141,6 +141,7 @@ push_repo() {
return
fi
run_cmd "rsync -vrtlh --delete-before ${repo_basepath}/${repo_basename} ${remote_login}:${repo_remote_basepath}/ ${dry}"
run_cmd_check 1 "Could not push packages to remote repo!"
run_cmd "rsync -vrtlh ${repo_basepath}/archive_${repo_basename} ${remote_login}:${repo_remote_basepath}/ ${dry}"
run_cmd_check 1 "Could not push packages to remote repo!"
}
@ -152,6 +153,7 @@ push_testing_repo() {
return
fi
run_cmd "rsync -vrtlh --delete-before ${repo_basepath}/${repo_basename}-testing ${remote_login}:${repo_remote_basepath}/ ${dry}"
run_cmd_check 1 "Could not push packages to remote testing repo!"
run_cmd "rsync -vrtlh ${repo_basepath}/${repo_basename}-testing ${repo_basepath}/archive_${repo_basename}-testing ${remote_login}:${repo_remote_basepath}/ ${dry}"
run_cmd_check 1 "Could not push packages to remote testing repo!"
}

24
src/kernels/_utils.sh
Unescape View File

@ -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")

28
src/kernels/dkms.sh
Unescape View File

@ -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")

30
src/kernels/linux-lts.sh
Unescape View File

@ -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

30
src/kernels/linux.sh
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save