update ZFS to get better work-around for UBSAN bounds-checking

[pve-kernel.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index b4bfb5c14e204c30663c594f5bf3911a3771a67a..78b7f777a763122ea45824b16d8a7507325e1211 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -96,7 +96,9 @@ PMX_CONFIG_OPTS= \
 -e CONFIG_SECURITY_LOCKDOWN_LSM \
 -e CONFIG_SECURITY_LOCKDOWN_LSM_EARLY \
 --set-str CONFIG_LSM lockdown,yama,integrity,apparmor \
--e CONFIG_PAGE_TABLE_ISOLATION
+-e CONFIG_PAGE_TABLE_ISOLATION \
+-e CONFIG_ARCH_HAS_CPU_FINALIZE_INIT \
+-d CONFIG_GDS_FORCE_MITIGATION \
 
 debian/control: $(wildcard debian/*.in)
        sed -e 's/@@KVNAME@@/$(KVNAME)/g' < debian/proxmox-kernel.prerm.in > debian/$(PMX_KERNEL_PKG).prerm
@@ -155,7 +157,7 @@ binary: install
        $(MAKE) -C $(KERNEL_SRC) INSTALL_MOD_PATH=$(BUILD_DIR)/debian/$(PMX_KERNEL_PKG)/ modules_install
        # install zfs drivers
        install -d -m 0755 debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs
-       install -m 644 $(addprefix $(MODULES)/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs
+       install -m 644 $(MODULES)/zfs.ko $(MODULES)/spl.ko debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs
        # remove firmware
        rm -rf debian/$(PMX_KERNEL_PKG)/lib/firmware
 
@@ -194,11 +196,11 @@ endif
        touch $@
 
 .tools_compile_mark: .compile_mark
-       $(MAKE) -C $(KERNEL_SRC)/tools/perf prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python3
+       $(MAKE) -C $(KERNEL_SRC)/tools/perf prefix=/usr NO_LIBTRACEEVENT=1 HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python3
        echo "checking GPL-2 only perf binary for library linkage with incompatible licenses.."
        ! ldd $(KERNEL_SRC)/tools/perf/perf | grep -q -E '\blibbfd'
        ! ldd $(KERNEL_SRC)/tools/perf/perf | grep -q -E '\blibcrypto'
-       $(MAKE) -C $(KERNEL_SRC)/tools/perf man
+       $(MAKE) -C $(KERNEL_SRC)/tools/perf NO_LIBTRACEEVENT=1 man
        touch $@
 
 .tools_install_mark: .tools_compile_mark
@@ -280,15 +282,8 @@ $(MODULES)/zfs.ko: .compile_mark
        cd $(MODULES)/$(ZFSDIR); ./autogen.sh
        cd $(MODULES)/$(ZFSDIR); ./configure --with-config=kernel --with-linux=$(BUILD_DIR)/$(KERNEL_SRC) --with-linux-obj=$(BUILD_DIR)/$(KERNEL_SRC)
        $(MAKE) -C $(MODULES)/$(ZFSDIR)
-       cp $(MODULES)/$(ZFSDIR)/module/avl/zavl.ko $(MODULES)/
-       cp $(MODULES)/$(ZFSDIR)/module/nvpair/znvpair.ko $(MODULES)/
-       cp $(MODULES)/$(ZFSDIR)/module/unicode/zunicode.ko $(MODULES)/
-       cp $(MODULES)/$(ZFSDIR)/module/zcommon/zcommon.ko $(MODULES)/
-       cp $(MODULES)/$(ZFSDIR)/module/icp/icp.ko $(MODULES)/
-       cp $(MODULES)/$(ZFSDIR)/module/zfs/zfs.ko $(MODULES)/
-       cp $(MODULES)/$(ZFSDIR)/module/lua/zlua.ko $(MODULES)/
-       cp $(MODULES)/$(ZFSDIR)/module/spl/spl.ko $(MODULES)/
-       cp $(MODULES)/$(ZFSDIR)/module/zstd/zzstd.ko $(MODULES)/
+       cp $(MODULES)/$(ZFSDIR)/module/zfs.ko $(MODULES)/
+       cp $(MODULES)/$(ZFSDIR)/module/spl.ko $(MODULES)/
 
 fwlist-$(KVNAME): .compile_mark .modules_compile_mark
        debian/scripts/find-firmware.pl debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME) >fwlist.tmp