aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-06-18 19:53:10 +0300
committerKhem Raj <raj.khem@gmail.com>2019-06-18 15:58:26 -0700
commit7727e4cb99204727a3651d9529e4a0cb971d1a51 (patch)
tree5b7967abaf8e70c99c68cc0d7066bfc667574282
parente01261885b0290f6bcadede64cb4d18421d2733f (diff)
downloadmeta-openembedded-contrib-7727e4cb99204727a3651d9529e4a0cb971d1a51.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>
-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 507ac50eca1..31f2f17fc8b 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -51,12 +51,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
phoronix-test-suite->php \
"
-# Depends on ndctl (through nvdimm PACKAGECONFIG) which depends on MACHINE_ARCH kernel
-# and making libblockdev MACHINE_ARCH is not an option as python3-blivet, udisks2, gvfs
-# would be MACHINE_ARCH as well
-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
- libblockdev->ndctl \
-"
# ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
terminus-font->fontconfig \
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-oe/recipes-core/ndctl/ndctl_v63.bb
index 61e53029b31..2f299b1ba5e 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
SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32"
SRC_URI = "git://github.com/pmem/ndctl.git"
-DEPENDS = "virtual/kernel kmod udev json-c"
+DEPENDS = "kmod udev json-c"
S = "${WORKDIR}/git"
EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs"
-# Depends on MACHINE_ARCH kernel
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"