Skip to content

Commit

Permalink
Update to OpenZFS 2.2.2
Browse files Browse the repository at this point in the history
Kernel update - [amd64-generic, amd64-generic, amd64-rt, arm64-nvidia, arm64-generic, arm64-generic]

eve-kernel-amd64-v5.10.186-generic
    4d7866684f79: Update to OpenZFS 2.2.2

eve-kernel-amd64-v6.1.38-generic
    820be3b1c356: Update to OpenZFS 2.2.2

eve-kernel-amd64-v6.1.38-rt
    7148ced52fc1: Update to OpenZFS 2.2.2

eve-kernel-arm64-v5.10.104-nvidia
    ab0df9cfc431: Update to OpenZFS 2.2.2

eve-kernel-arm64-v5.10.186-generic
    438959506e33: Update to OpenZFS 2.2.2

eve-kernel-arm64-v6.1.38-generic
    50c6e530bbd2: Update to OpenZFS 2.2.2

Remove modifications to now unused kernel module parameters.
Don't apply patches as they're now included in upstream.
Remove now unused patches under dom0-ztools
Patch go-libzfs for OpenZFS 2.2.2 support

Signed-off-by: Andrew Durbin <andrewd@zededa.com>
  • Loading branch information
andrewd-zededa committed Feb 27, 2024
1 parent 59aab5e commit b382721
Show file tree
Hide file tree
Showing 13 changed files with 146 additions and 908 deletions.
12 changes: 6 additions & 6 deletions kernel-commits.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
KERNEL_COMMIT_amd64_v5.10.186_generic = be89a9e63306
KERNEL_COMMIT_amd64_v6.1.38_generic = d586ca2d3f2e
KERNEL_COMMIT_amd64_v6.1.38_rt = 49dba60a59d9
KERNEL_COMMIT_arm64_v5.10.104_nvidia = c21d5a4dd498
KERNEL_COMMIT_arm64_v5.10.186_generic = 6a861e0433a6
KERNEL_COMMIT_arm64_v6.1.38_generic = 92466d23a9bf
KERNEL_COMMIT_amd64_v5.10.186_generic = 4d7866684f79
KERNEL_COMMIT_amd64_v6.1.38_generic = 820be3b1c356
KERNEL_COMMIT_amd64_v6.1.38_rt = 7148ced52fc1
KERNEL_COMMIT_arm64_v5.10.104_nvidia = ab0df9cfc431
KERNEL_COMMIT_arm64_v5.10.186_generic = 438959506e33
KERNEL_COMMIT_arm64_v6.1.38_generic = 50c6e530bbd2
KERNEL_COMMIT_riscv64_v6.1.38_generic = ad6a4589904a
14 changes: 1 addition & 13 deletions pkg/dom0-ztools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,17 @@ ENV BUILD_PKGS git patch ca-certificates util-linux build-base gettext-dev libti
ENV PKGS ca-certificates util-linux libintl libuuid libtirpc libblkid libcrypto1.1 zlib
RUN eve-alpine-deploy.sh

COPY /patches /

# should be aligned with kernel
# * ZFS on Linux
ENV ZFS_VERSION=2.1.2
ENV ZFS_VERSION=2.2.2
ENV ZFS_COMMIT=zfs-${ZFS_VERSION}
ENV ZFS_REPO=https://github.com/openzfs/zfs
ENV ZFS_PATCH_DIR=/patches-zfs-"${ZFS_VERSION}"

WORKDIR /tmp/zfs

ADD ${ZFS_REPO}/tarball/${ZFS_COMMIT}/ zfs.tgz
RUN tar -zxvf zfs.tgz --strip-components=1 && \
rm zfs.tgz
RUN set -e; \
if [ ! -d "${ZFS_PATCH_DIR}" ]; then \
echo "No such dir ${ZFS_PATCH_DIR}"; \
else \
for patch in "${ZFS_PATCH_DIR}"/*.patch; do \
echo "Applying $patch"; \
patch -p1 < "$patch"; \
done \
fi
RUN ./autogen.sh && \
./configure \
--prefix=/usr \
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit b382721

Please sign in to comment.