summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/conf/layer.conf6
-rw-r--r--meta-oe/recipes-core/ndctl/ndctl_v63.bb3
2 files changed, 9 insertions, 0 deletions
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index bc9039041..c7dbbc107 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -51,6 +51,12 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
51 phoronix-test-suite->php \ 51 phoronix-test-suite->php \
52" 52"
53 53
54# Depends on ndctl (through nvdimm PACKAGECONFIG) which depends on MACHINE_ARCH kernel
55# and making libblockdev MACHINE_ARCH is not an option as python3-blivet, udisks2, gvfs
56# would be MACHINE_ARCH as well
57SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
58 libblockdev->ndctl \
59"
54# ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS 60# ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS
55SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ 61SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
56 terminus-font->fontconfig \ 62 terminus-font->fontconfig \
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-oe/recipes-core/ndctl/ndctl_v63.bb
index 1f3abf514..61e53029b 100644
--- a/meta-oe/recipes-core/ndctl/ndctl_v63.bb
+++ b/meta-oe/recipes-core/ndctl/ndctl_v63.bb
@@ -19,6 +19,9 @@ S = "${WORKDIR}/git"
19 19
20EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" 20EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs"
21 21
22# Depends on MACHINE_ARCH kernel
23PACKAGE_ARCH = "${MACHINE_ARCH}"
24
22PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" 25PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
23PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" 26PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"
24 27