Skip to content

Commit

Permalink
Update to zfs version 2.2.3 (#526)
Browse files Browse the repository at this point in the history
  • Loading branch information
nightah committed Feb 23, 2024
1 parent 7a86227 commit 7568d35
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 1,947 deletions.
4 changes: 2 additions & 2 deletions conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
#
# FIXME: reset all kernel configs set to pkgrel=1 when this changes
#
openzfs_version="2.2.2"
openzfs_version="2.2.3"
openzfs_rc_version="2.1.0-rc8"

# The OpenZFS source hashes are from github.com/openzfs/zfs/releases
zfs_src_hash="76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9"
zfs_src_hash="30a512f34ec5c841b8b2b32cc9c1a03fd49391b26c9164d3fb30573fb5d81ac3"
zfs_rc_src_hash="8627702ac841d38d5211001c76937e4097719c268b110e8836c0da195618fad2"

zfs_initcpio_install_hash="d19476c6a599ebe3415680b908412c8f19315246637b3a61e811e2e0961aea78"
Expand Down
2 changes: 1 addition & 1 deletion src/kernels/dkms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mode_name="dkms"
mode_desc="Select and use the dkms packages"

# version
pkgrel="3"
pkgrel="1"

# Version for GIT packages
pkgrel_git="1"
Expand Down
8 changes: 2 additions & 6 deletions src/zfs-dkms/PKGBUILD.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ pkgrel=${zfs_pkgrel}
makedepends=(${zfs_makedepends})
arch=("x86_64")
url="https://openzfs.org/"
source=("${zfs_src_target}" "linux-6.7-compat.patch")
sha256sums=("${zfs_src_hash}" "43bca1a6717bfc77d42a4c51656c38674c6be8d7ec46f04c7febcdafd9295916")
source=("${zfs_src_target}")
sha256sums=("${zfs_src_hash}")
license=("CDDL")
depends=("${zfs_utils_pkgname}" "lsb-release" "dkms")
provides=("zfs" "zfs-headers" "spl" "spl-headers")
Expand All @@ -37,8 +37,4 @@ package() {
EOF

if [[ ! ${archzfs_package_group} =~ -git$ ]] && [[ ! ${archzfs_package_group} =~ -rc$ ]]; then
sed -E -i "/^build()/i prepare() {\n cd \"${zfs_workdir}\"\n patch -Np1 -i \${srcdir}/linux-6.7-compat.patch\n}" ${zfs_dkms_pkgbuild_path}/PKGBUILD
fi

pkgbuild_cleanup "${zfs_dkms_pkgbuild_path}/PKGBUILD"

0 comments on commit 7568d35

Please sign in to comment.