From c45a72ba3536c6b10473fdfcafb8a724041fbd43 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 10 Jul 2019 10:46:52 +0000 Subject: ndctl: Remove the unnecessary dependency on virtual/kernel This also makes it no longer specific to MACHINE_ARCH. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/conf/layer.conf | 6 ------ meta-oe/recipes-core/ndctl/ndctl_v63.bb | 5 +---- 2 files changed, 1 insertion(+), 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 += " \ 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 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 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" -- cgit v1.2.3-54-g00ecf