From 720fee3275936950bda8aead1b927ebe3ff6e3bd Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Jan 2024 16:12:21 -0500 Subject: [PATCH] Adjust --- debian/patches/series.zfs | 2 -- debian/rules | 4 ++-- debian/templates/control.in | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/patches/series.zfs b/debian/patches/series.zfs index f0d8ab6..5fd3ae9 100644 --- a/debian/patches/series.zfs +++ b/debian/patches/series.zfs @@ -7,6 +7,4 @@ zfs/0006-dont-symlink-zed-scripts.patch zfs/0007-Add-systemd-unit-for-importing-specific-pools.patch zfs/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch zfs/0009-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch -zfs/0010-zvol-Remove-broken-blk-mq-optimization.patch -zfs/0011-Revert-zvol-Temporally-disable-blk-mq.patch zfs/0012-change-zfs-lic-cddl-to-gpl.patch diff --git a/debian/rules b/debian/rules index 39d060f..98082a0 100755 --- a/debian/rules +++ b/debian/rules @@ -43,11 +43,11 @@ override_dh_quilt_unpatch: cd ${KERNEL_SRC}; \ QUILT_PATCHES=../debian/patches \ QUILT_SERIES=series.linux \ - quilt --quiltrc /dev/null pop -a || test $$? = 2 + quilt --quiltrc /dev/null pop -af || test $$? = 2 cd ${ZFS_SRC}; \ QUILT_PATCHES=../debian/patches \ QUILT_SERIES=series.zfs \ - quilt --quiltrc /dev/null pop -a || test $$? = 2 + quilt --quiltrc /dev/null pop -af || test $$? = 2 rm -rf ${KERNEL_SRC}/.pc ${ZFS_SRC}/.pc override_dh_autoreconf: diff --git a/debian/templates/control.in b/debian/templates/control.in index b4879da..50051e5 100644 --- a/debian/templates/control.in +++ b/debian/templates/control.in @@ -23,7 +23,7 @@ Build-Depends: asciidoc, libunwind-dev, libcap-dev, libbabeltrace-dev, - openjdk-8-jdk, + openjdk-17-jdk, libtraceevent-dev, lz4, python3-minimal,