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

Follow upstream ZFS branding

Browse Source
pull/488/head
Namkhai B 2 years ago committed by Jan Houben
parent 45efc08cb2
commit 0d5e746750
17 changed files with 48 additions and 48 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. 2
      build.sh
  2. 8
      conf.sh
  3. 10
      lib.sh
  4. 4
      push.sh
  5. 4
      scraper.sh
  6. 10
      src/kernels/_utils.sh
  7. 2
      src/kernels/archiso.sh
  8. 10
      src/kernels/dkms.sh
  9. 6
      src/kernels/linux-hardened.sh
  10. 10
      src/kernels/linux-lts.sh
  11. 6
      src/kernels/linux-vfio.sh
  12. 6
      src/kernels/linux-zen.sh
  13. 10
      src/kernels/linux.sh
  14. 2
      src/zfs-dkms/PKGBUILD.sh
  15. 2
      src/zfs-utils/PKGBUILD.sh
  16. 2
      src/zfs/PKGBUILD.sh
  17. 2
      testing/README.rst

2
build.sh
Unescape View File

@ -103,7 +103,7 @@ generate_package_files() {
debug "zfs_pkgver: ${zfs_pkgver}"
debug "zfs_pkgrel: ${zfs_pkgrel}"
debug "zfs_makedepends: ${zfs_makedepends}"
debug "zol_version: ${zol_version}"
debug "openzfs_version: ${openzfs_version}"
debug "zfs_utils_pkgname: ${zfs_utils_pkgname}"
debug "zfs_pkgname: ${zfs_pkgname}"
debug "zfs_utils_pkgbuild_path: ${zfs_utils_pkgbuild_path}"

8
conf.sh
Unescape View File

@ -1,11 +1,11 @@
# ZFSonLinux stable version
# OpenZFS stable version
#
# FIXME: reset all kernel configs set to pkgrel=1 when this changes
#
zol_version="2.1.9"
zol_rc_version="2.1.0-rc8"
openzfs_version="2.1.9"
openzfs_rc_version="2.1.0-rc8"
# The ZOL source hashes are from zfsonlinux.org
# The OpenZFS source hashes are from github.com/openzfs/zfs/releases
zfs_src_hash="6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6"
zfs_rc_src_hash="8627702ac841d38d5211001c76937e4097719c268b110e8836c0da195618fad2"

10
lib.sh
Unescape View File

@ -522,13 +522,13 @@ check_result() {
fi
}
check_zol_version() {
check_openzfs_version() {
#
# Check ZFSonLinux.org
# Check OpenZFS.org
#
msg "Checking zfsonlinux.org for new versions..."
check_webpage "https://github.com/zfsonlinux/zfs/releases/latest" "(?<=/zfsonlinux/zfs/releases/download/zfs-)[\d\.]*" "${zol_version}"
check_result "ZOL stable version" "ZOL stable version" "$?"
msg "Checking openzfs.org for new versions..."
check_webpage "https://github.com/openzfs/zfs/releases/latest" "(?<=/openzfs/zfs/releases/download/zfs-)[\d\.]*" "${openzfs_version}"
check_result "OpenZFS stable version" "OpenZFS stable version" "$?"
}

4
push.sh
Unescape View File

@ -117,9 +117,9 @@ push_packages() {
fi
if [[ ! -z ${zfs_pkgver} ]] && [[ ${pkg} =~ .*-rc ]]; then
vers+="zfs ${zol_rc_version}"
vers+="zfs ${openzfs_rc_version}"
elif [[ ! -z ${zfs_pkgver} ]]; then
vers+="zfs ${zol_version}"
vers+="zfs ${openzfs_version}"
else
vers+="latest git commit"
fi

4
scraper.sh
Unescape View File

@ -3,7 +3,7 @@
#
# A script for scraping data from the web. When ran in cron with a correct email address configured, an alert email will be
# sent notifying the user that either the "linux" kernel package version has changed, a new ZFSonLinux version has been
# sent notifying the user that either the "linux" kernel package version has changed, a new OpenZFS version has been
# released, or a new archiso has been released.
#
@ -77,7 +77,7 @@ debug_print_default_vars
export script_dir mode kernel_name
check_zol_version
check_openzfs_version
#

10
src/kernels/_utils.sh
Unescape View File

@ -8,7 +8,7 @@ pkgrel="1"
# Version for GIT packages
pkgrel_git="1"
zfs_git_commit=""
zfs_git_url="https://github.com/zfsonlinux/zfs.git"
zfs_git_url="https://github.com/openzfs/zfs.git"
# Version for RC packages
pkgrel_rc="1"
@ -25,12 +25,12 @@ header="\
update_utils_pkgbuilds() {
pkg_list=("zfs-utils")
archzfs_package_group="archzfs-linux"
zfs_pkgver=${zol_version}
zfs_pkgver=${openzfs_version}
zfs_pkgrel=${pkgrel}
zfs_utils_pkgname="zfs-utils"
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${pkgver}/zfs-\${pkgver}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${pkgver}"
zfs_utils_replaces='replaces=("zfs-utils-linux" "zfs-utils-linux-lts" "zfs-utils-common")'
}
@ -38,13 +38,13 @@ update_utils_pkgbuilds() {
# update_utils_rc_pkgbuilds() {
# pkg_list=("zfs-utils-rc")
# archzfs_package_group="archzfs-linux-rc"
# zfs_pkgver=${zol_rc_version/-/_}
# zfs_pkgver=${openzfs_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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${pkgver/_/-}/zfs-\${pkgver/_/-}.tar.gz"
# zfs_workdir="\${srcdir}/zfs-\${pkgver/_rc*/}"
# }

2
src/kernels/archiso.sh
Unescape View File

@ -41,7 +41,7 @@ update_archiso_linux_pkgbuilds() {
zfs_utils_pkgname="zfs-utils=\${_zfsver}"
zfs_pkgname="zfs-archiso-linux"
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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${_zfsver}/zfs-\${_zfsver}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${_zfsver}"
linux_depends="\"linux=\${_kernelver}\""
linux_headers_depends="\"linux-headers=\${_kernelver}\""

10
src/kernels/dkms.sh
Unescape View File

@ -8,7 +8,7 @@ pkgrel="1"
# Version for GIT packages
pkgrel_git="1"
zfs_git_commit=""
zfs_git_url="https://github.com/zfsonlinux/zfs.git"
zfs_git_url="https://github.com/openzfs/zfs.git"
# Version for RC packages
pkgrel_rc="1"
@ -25,14 +25,14 @@ header="\
update_dkms_pkgbuilds() {
pkg_list=("zfs-dkms")
archzfs_package_group="archzfs-dkms"
zfs_pkgver=${zol_version}
zfs_pkgver=${openzfs_version}
zfs_mod_ver="\${pkgver}"
zfs_pkgrel=${pkgrel}
zfs_pkgname="zfs-dkms"
zfs_utils_pkgname="zfs-utils=\${pkgver}"
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${pkgver}/zfs-\${pkgver}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${pkgver}"
zfs_replaces='replaces=("spl-dkms")'
}
@ -40,7 +40,7 @@ update_dkms_pkgbuilds() {
# update_dkms_rc_pkgbuilds() {
# pkg_list=("zfs-dkms-rc")
# archzfs_package_group="archzfs-dkms-rc"
# zfs_pkgver=${zol_rc_version/-/_}
# zfs_pkgver=${openzfs_rc_version/-/_}
# zfs_mod_ver="\${pkgver}"
# zfs_pkgrel=${pkgrel_rc}
# zfs_pkgname="zfs-dkms-rc"
@ -48,7 +48,7 @@ update_dkms_pkgbuilds() {
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${pkgver/_/-}/zfs-\${pkgver/_/-}.tar.gz"
# zfs_workdir="\${srcdir}/zfs-\${pkgver/_rc*/}"
# }

6
src/kernels/linux-hardened.sh
Unescape View File

@ -9,7 +9,7 @@ pkgrel="1"
# pkgrel for GIT packages
pkgrel_git="1"
zfs_git_commit=""
zfs_git_url="https://github.com/zfsonlinux/zfs.git"
zfs_git_url="https://github.com/openzfs/zfs.git"
header="\
# Maintainer: Jan Houben <jan@nexttrex.de>
@ -49,14 +49,14 @@ update_linux_hardened_pkgbuilds() {
get_kernel_options
pkg_list=("zfs-linux-hardened")
archzfs_package_group="archzfs-linux-hardened"
zfs_pkgver=${zol_version}
zfs_pkgver=${openzfs_version}
zfs_pkgrel=${pkgrel}
zfs_conflicts="'zfs-linux-hardened-git' 'spl-linux-hardened'"
zfs_pkgname="zfs-linux-hardened"
zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${_zfsver}/zfs-\${_zfsver}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${_zfsver}"
zfs_replaces='replaces=("spl-linux-hardened")'
}

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

@ -9,7 +9,7 @@ pkgrel="1"
# pkgrel for GIT packages
pkgrel_git="1"
zfs_git_commit=""
zfs_git_url="https://github.com/zfsonlinux/zfs.git"
zfs_git_url="https://github.com/openzfs/zfs.git"
# Version for RC packages
pkgrel_rc="1"
@ -51,14 +51,14 @@ update_linux_lts_pkgbuilds() {
get_kernel_options
pkg_list=("zfs-linux-lts")
archzfs_package_group="archzfs-linux-lts"
zfs_pkgver=${zol_version}
zfs_pkgver=${openzfs_version}
zfs_pkgrel=${pkgrel}
zfs_conflicts="'zfs-linux-lts-git' 'zfs-linux-lts-rc' 'spl-linux-lts'"
zfs_pkgname="zfs-linux-lts"
zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${_zfsver}/zfs-\${_zfsver}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${_zfsver}"
zfs_replaces='replaces=("spl-linux-lts")'
}
@ -67,7 +67,7 @@ update_linux_lts_pkgbuilds() {
# get_kernel_options
# pkg_list=("zfs-linux-lts-rc")
# archzfs_package_group="archzfs-linux-lts-rc"
# zfs_pkgver=${zol_rc_version/-/_}
# zfs_pkgver=${openzfs_rc_version/-/_}
# zfs_pkgrel=${pkgrel_rc}
# zfs_conflicts="'zfs-linux-lts' 'zfs-linux-lts-git' 'spl-linux-lts'"
# zfs_pkgname="zfs-linux-lts-rc"
@ -75,7 +75,7 @@ update_linux_lts_pkgbuilds() {
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${_zfsver/_/-}/zfs-\${_zfsver/_/-}.tar.gz"
# zfs_workdir="\${srcdir}/zfs-\${_zfsver/_rc*/}"
# }

6
src/kernels/linux-vfio.sh
Unescape View File

@ -9,7 +9,7 @@ pkgrel="1"
# pkgrel for GIT packages
pkgrel_git="1"
zfs_git_commit=""
zfs_git_url="https://github.com/zfsonlinux/zfs.git"
zfs_git_url="https://github.com/openzfs/zfs.git"
header="\
# Maintainer: Jan Houben <jan@nexttrex.de>
@ -48,14 +48,14 @@ update_linux_vfio_pkgbuilds() {
get_kernel_options
pkg_list=("zfs-linux-vfio")
archzfs_package_group="archzfs-linux-vfio"
zfs_pkgver=${zol_version}
zfs_pkgver=${openzfs_version}
zfs_pkgrel=${pkgrel}
zfs_conflicts="'zfs-linux-vfio-git' 'spl-linux-vfio'"
zfs_pkgname="zfs-linux-vfio"
zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${_zfsver}/zfs-\${_zfsver}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${_zfsver}"
zfs_replaces='replaces=("spl-linux-vfio")'
}

6
src/kernels/linux-zen.sh
Unescape View File

@ -9,7 +9,7 @@ pkgrel="1"
# pkgrel for GIT packages
pkgrel_git="1"
zfs_git_commit=""
zfs_git_url="https://github.com/zfsonlinux/zfs.git"
zfs_git_url="https://github.com/openzfs/zfs.git"
header="\
# Maintainer: Jan Houben <jan@nexttrex.de>
@ -49,14 +49,14 @@ update_linux_zen_pkgbuilds() {
get_kernel_options
pkg_list=("zfs-linux-zen")
archzfs_package_group="archzfs-linux-zen"
zfs_pkgver=${zol_version}
zfs_pkgver=${openzfs_version}
zfs_pkgrel=${pkgrel}
zfs_conflicts="'zfs-linux-zen-git' 'spl-linux-zen'"
zfs_pkgname="zfs-linux-zen"
zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${_zfsver}/zfs-\${_zfsver}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${_zfsver}"
zfs_replaces='replaces=("spl-linux-zen")'
}

10
src/kernels/linux.sh
Unescape View File

@ -9,7 +9,7 @@ pkgrel="1"
# pkgrel for GIT packages
pkgrel_git="1"
zfs_git_commit=""
zfs_git_url="https://github.com/zfsonlinux/zfs.git"
zfs_git_url="https://github.com/openzfs/zfs.git"
# Version for RC packages
pkgrel_rc="1"
@ -52,14 +52,14 @@ update_linux_pkgbuilds() {
get_kernel_options
pkg_list=("zfs-linux")
archzfs_package_group="archzfs-linux"
zfs_pkgver=${zol_version}
zfs_pkgver=${openzfs_version}
zfs_pkgrel=${pkgrel}
zfs_conflicts="'zfs-linux-git' 'zfs-linux-rc' 'spl-linux'"
zfs_pkgname="zfs-linux"
zfs_utils_pkgname="zfs-utils=\${_zfsver}"
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${_zfsver}/zfs-\${_zfsver}.tar.gz"
zfs_workdir="\${srcdir}/zfs-\${_zfsver}"
zfs_replaces='replaces=("spl-linux")'
}
@ -69,7 +69,7 @@ update_linux_pkgbuilds() {
# get_kernel_options
# pkg_list=("zfs-linux-rc")
# archzfs_package_group="archzfs-linux-rc"
# zfs_pkgver=${zol_rc_version/-/_}
# zfs_pkgver=${openzfs_rc_version/-/_}
# zfs_pkgrel=${pkgrel_rc}
# zfs_conflicts="'zfs-linux' 'zfs-linux-git' 'spl-linux'"
# zfs_pkgname="zfs-linux-rc"
@ -77,7 +77,7 @@ update_linux_pkgbuilds() {
# 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_src_target="https://github.com/openzfs/zfs/releases/download/zfs-\${_zfsver/_/-}/zfs-\${_zfsver/_/-}.tar.gz"
# zfs_workdir="\${srcdir}/zfs-\${_zfsver/_rc*/}"
# }

2
src/zfs-dkms/PKGBUILD.sh
Unescape View File

@ -9,7 +9,7 @@ pkgver=${zfs_pkgver}
pkgrel=${zfs_pkgrel}
makedepends=(${zfs_makedepends})
arch=("x86_64")
url="https://zfsonlinux.org/"
url="https://openzfs.org/"
source=("${zfs_src_target}")
sha256sums=("${zfs_src_hash}")
license=("CDDL")

2
src/zfs-utils/PKGBUILD.sh
Unescape View File

@ -10,7 +10,7 @@ pkgdesc="Kernel module support files for the Zettabyte File System."
makedepends=("python" "python-setuptools" "python-cffi" ${zfs_makedepends})
optdepends=("python: pyzfs and extra utilities", "python-cffi: pyzfs")
arch=("x86_64")
url="http://zfsonlinux.org/"
url="http://openzfs.org/"
source=("${zfs_src_target}"
"zfs-utils.initcpio.install"
"zfs-utils.initcpio.hook"

2
src/zfs/PKGBUILD.sh
Unescape View File

@ -15,7 +15,7 @@ pkgver="\${_zfsver}_\$(echo \${_kernelver} | sed s/-/./g)"
pkgrel=${zfs_pkgrel}
makedepends=(${linux_headers_depends} ${zfs_makedepends})
arch=("x86_64")
url="https://zfsonlinux.org/"
url="https://openzfs.org/"
source=("${zfs_src_target}")
sha256sums=("${zfs_src_hash}")
license=("CDDL")

2
testing/README.rst
Unescape View File

@ -305,7 +305,7 @@ Attempting to run `zpool status` results in::
Let's make zfs start automatically on boot via the base image setup scripts.
But first, we must understand the updated systemd configuration for ZFSonLinux.
But first, we must understand the updated systemd configuration for OpenZFS.
Running `pacman -Ql zfs-linux` show the systemd files::

Write Preview
Loading…
Cancel
Save