[meta-filesystems][PATCH 1/2] zfs: Disable on mips

[meta-filesystems][PATCH 1/2] zfs: Disable on mips

[Khem Raj]

Fails to build on mips at this time, if someone provides fixes it can be
enabled then

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb
index 96e07cc454..fb19796abe 100644
--- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb
+++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb
@@ -56,3 +56,5 @@ FILES:${PN}-dev += "\
     "
 # Not yet ported to rv32
 COMPATIBLE_HOST:riscv32 = "null"
+# conflicting definition of ABS macro from asm/asm.h from kernel
+COMPATIBLE_HOST:mips = "null"
-- 
2.36.1

[meta-filesystems][PATCH 2/2] zfs: Make systemd and sysvinit into packageconfigs

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb
index fb19796abe..dd676c945c 100644
--- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb
+++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.4.bb
@@ -1,4 +1,3 @@
-
 SUMMARY = "OpenZFS on Linux and FreeBSD"
 DESCRIPTION = "OpenZFS on Linux and FreeBSD"
 LICENSE = "CDDL-1.0"
@@ -17,15 +16,17 @@ inherit module-base pkgconfig autotools
 
 DEPENDS = "virtual/kernel zlib util-linux libtirpc openssl curl"
 
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit', d)}"
+
 PACKAGECONFIG[pam] = "--enable-pam --with-pamconfigsdir=${datadir}/pam-configs --with-pammoduledir=${libdir}/security, --disable-pam"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,"
+PACKAGECONFIG[sysvinit] = "--enable-sysvinit,--disable-sysvinit,"
 
 EXTRA_OECONF:append = " \
     --disable-pyzfs \
     --with-linux=${STAGING_KERNEL_DIR} --with-linux-obj=${STAGING_KERNEL_BUILDDIR} \
     --with-mounthelperdir=${base_sbin} \
     --with-udevdir=${base_libdir}/udev \
-    --enable-systemd \
-    --disable-sysvinit \
     --without-dracutdir \
     "
 
-- 
2.36.1