summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-10 10:46:52 +0000
committerArmin Kuster <akuster808@gmail.com>2019-07-13 12:40:31 -0700
commitc45a72ba3536c6b10473fdfcafb8a724041fbd43 (patch)
tree6f71f9c355444df75c8190dc0d1d2333147dd7b9
parent3e51a60a47132cb24e45a1c87babd65c993c60e5 (diff)
downloadmeta-openembedded-c45a72ba3536c6b10473fdfcafb8a724041fbd43.tar.gz
ndctl: Remove the unnecessary dependency on virtual/kernel
This also makes it no longer specific to MACHINE_ARCH. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/conf/layer.conf6
-rw-r--r--meta-oe/recipes-core/ndctl/ndctl_v63.bb5
2 files changed, 1 insertions, 10 deletions
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index c7dbbc107..bc9039041 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -51,12 +51,6 @@ 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"
60# ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS 54# ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS
61SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ 55SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
62 terminus-font->fontconfig \ 56 terminus-font->fontconfig \
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-oe/recipes-core/ndctl/ndctl_v63.bb
index 61e53029b..2f299b1ba 100644
--- a/meta-oe/recipes-core/ndctl/ndctl_v63.bb
+++ b/meta-oe/recipes-core/ndctl/ndctl_v63.bb
@@ -13,15 +13,12 @@ inherit autotools-brokensep pkgconfig bash-completion systemd
13SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32" 13SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32"
14SRC_URI = "git://github.com/pmem/ndctl.git" 14SRC_URI = "git://github.com/pmem/ndctl.git"
15 15
16DEPENDS = "virtual/kernel kmod udev json-c" 16DEPENDS = "kmod udev json-c"
17 17
18S = "${WORKDIR}/git" 18S = "${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
25PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" 22PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
26PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" 23PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"
27 24