| Message ID | 20231113005833.3858363-2-salvador.joseluis@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/zfs: bump version to 2.2.0 | expand |
José, All, On 2023-11-13 01:58 +0100, José Luis Salvador Rufo spake thusly: > Removed backported patch: > - https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch > > Updated ZFS test to pass this new version. I've extended this to explain why we can drop the explicit -m option. > Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com> Applied to next, thanks. Regards, Yann E. MORIN. > --- > package/zfs/zfs.hash | 5 ++--- > package/zfs/zfs.mk | 3 +-- > support/testing/tests/package/test_zfs.py | 4 ++-- > 3 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash > index 3a73e5e94f..b02c49234a 100644 > --- a/package/zfs/zfs.hash > +++ b/package/zfs/zfs.hash > @@ -1,6 +1,5 @@ > -# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.12/zfs-2.1.12.sha256.asc > -sha256 64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d zfs-2.1.12.tar.gz > -sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch > +# Locally computed > +sha256 42035fd059faa25a09cd511b24a57b8ad1285cb69127f2a0043b98562c5ec690 zfs-2.2.0.tar.gz > > # Hash for license files: > sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE > diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk > index f0461ea9ec..d85956c98b 100644 > --- a/package/zfs/zfs.mk > +++ b/package/zfs/zfs.mk > @@ -4,9 +4,8 @@ > # > ################################################################################ > > -ZFS_VERSION = 2.1.12 > +ZFS_VERSION = 2.2.0 > ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) > -ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch > ZFS_SELINUX_MODULES = zfs > ZFS_LICENSE = CDDL > ZFS_LICENSE_FILES = LICENSE COPYRIGHT > diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py > index 1f01ddd768..27dbc2869b 100644 > --- a/support/testing/tests/package/test_zfs.py > +++ b/support/testing/tests/package/test_zfs.py > @@ -40,11 +40,11 @@ class TestZfsBase(infra.basetest.BRTest): > > cmds = [ > # Init > - "modprobe zfs", > + "modprobe zfs && sleep 2", > "mount -o remount,size=132M /tmp", > "fallocate -l 64M /tmp/container1.raw", > "fallocate -l 64M /tmp/container2.raw", > - "zpool create -m /pool pool raidz /tmp/container1.raw /tmp/container2.raw", > + "zpool create pool raidz /tmp/container1.raw /tmp/container2.raw", > "dd if=/dev/urandom bs=1M count=8 of=/pool/urandom", > "sha256sum /pool/urandom > /tmp/urandom.sha256", > # Check ZFS > -- > 2.42.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 3a73e5e94f..b02c49234a 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,6 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.12/zfs-2.1.12.sha256.asc -sha256 64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d zfs-2.1.12.tar.gz -sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch +# Locally computed +sha256 42035fd059faa25a09cd511b24a57b8ad1285cb69127f2a0043b98562c5ec690 zfs-2.2.0.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index f0461ea9ec..d85956c98b 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,9 +4,8 @@ # ################################################################################ -ZFS_VERSION = 2.1.12 +ZFS_VERSION = 2.2.0 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) -ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL ZFS_LICENSE_FILES = LICENSE COPYRIGHT diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py index 1f01ddd768..27dbc2869b 100644 --- a/support/testing/tests/package/test_zfs.py +++ b/support/testing/tests/package/test_zfs.py @@ -40,11 +40,11 @@ class TestZfsBase(infra.basetest.BRTest): cmds = [ # Init - "modprobe zfs", + "modprobe zfs && sleep 2", "mount -o remount,size=132M /tmp", "fallocate -l 64M /tmp/container1.raw", "fallocate -l 64M /tmp/container2.raw", - "zpool create -m /pool pool raidz /tmp/container1.raw /tmp/container2.raw", + "zpool create pool raidz /tmp/container1.raw /tmp/container2.raw", "dd if=/dev/urandom bs=1M count=8 of=/pool/urandom", "sha256sum /pool/urandom > /tmp/urandom.sha256", # Check ZFS
Removed backported patch: - https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch Updated ZFS test to pass this new version. Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com> --- package/zfs/zfs.hash | 5 ++--- package/zfs/zfs.mk | 3 +-- support/testing/tests/package/test_zfs.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-)