From 885f87fa3ef93757e59a72c96971f76f277a8b65 Mon Sep 17 00:00:00 2001 From: Tony Hutter Date: Tue, 25 Mar 2025 10:30:48 -0700 Subject: [PATCH] ZTS: Fix zpool_status_features_001_pos local test (#17174) Update 'zfs-helpers.sh -i' to install the compatibility.d/ file symlinks. These are need to run the zpool_status_features_001_pos test from a local workspace (as opposed to running ZTS from a formal 'make install' or install from RPMs, which are unaffected). Signed-off-by: Tony Hutter Reviewed-by: @ImAwsumm Reviewed-by: Alexander Motin --- scripts/Makefile.am | 1 + scripts/zfs-helpers.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index ee8fb8717..f62352630 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -59,6 +59,7 @@ export INSTALL_UDEV_RULE_DIR=$(udevruledir) export INSTALL_MOUNT_HELPER_DIR=$(mounthelperdir) export INSTALL_SYSCONF_DIR=$(sysconfdir) export INSTALL_PYTHON_DIR=$(pythonsitedir) +export INSTALL_PKGDATA_DIR=$(pkgdatadir) export KMOD_SPL=$(abs_top_builddir)/module/spl.ko export KMOD_ZFS=$(abs_top_builddir)/module/zfs.ko diff --git a/scripts/zfs-helpers.sh b/scripts/zfs-helpers.sh index 8dcb06301..b45384a9a 100755 --- a/scripts/zfs-helpers.sh +++ b/scripts/zfs-helpers.sh @@ -163,6 +163,7 @@ if [ "${INSTALL}" = "yes" ]; then install "$UDEV_RULE_DIR/$rule" "$INSTALL_UDEV_RULE_DIR/$rule" done install "$ZPOOL_SCRIPT_DIR" "$INSTALL_SYSCONF_DIR/zfs/zpool.d" + install "$ZPOOL_COMPAT_DIR" "$INSTALL_PKGDATA_DIR/compatibility.d" install "$CONTRIB_DIR/pyzfs/libzfs_core" "$INSTALL_PYTHON_DIR/libzfs_core" # Ideally we would install these in the configured ${libdir}, which is # by default "/usr/local/lib and unfortunately not included in the @@ -179,6 +180,7 @@ else remove "$INSTALL_UDEV_RULE_DIR/69-vdev.rules" remove "$INSTALL_UDEV_RULE_DIR/90-zfs.rules" remove "$INSTALL_SYSCONF_DIR/zfs/zpool.d" + remove "$INSTALL_PKGDATA_DIR/compatibility.d" remove "$INSTALL_PYTHON_DIR/libzfs_core" remove "/lib/libzfs_core.so" remove "/lib/libnvpair.so"