From 41f5abd221807e663754daef3fdf1852ea4ec8c1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 11 Feb 2020 21:18:06 -0800 Subject: meta-oe: Remove dnf dependent package for non-rpm package backend dnf is not built when rpm is not in chosen backends Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 5 ++++- meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb | 1 + meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 929e7d5591..777623ba88 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -172,7 +172,8 @@ RDEPENDS_packagegroup-meta-oe-gnome ="\ " RDEPENDS_packagegroup-meta-oe-graphics ="\ - cairomm dietsplash directfb directfb-examples dnfdragora \ + cairomm dietsplash directfb directfb-examples \ + ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnfdragora dnf-plugin-tui", "", d)} \ fbgrab fbida fontforge fvwm glm gphoto2 libgphoto2 \ gtkperf jasper leptonica libmng libsdl2-image libsdl2-mixer libsdl2-net \ libsdl-gfx libsdl-image libsdl-mixer libsdl-net libsdl-ttf \ @@ -190,6 +191,8 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "freeglut libsdl2-ttf", "", d)} \ " + + RDEPENDS_packagegroup-meta-oe-kernel ="\ agent-proxy broadcom-bt-firmware cpupower \ crash ipmitool minicoredumper oprofile \ diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index a8367b5d91..5ecf649662 100644 --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -37,3 +37,4 @@ RDEPENDS_${PN} += " \ " BBCLASSEXTEND = "nativesdk" +PNBLACKLIST[dnf-plugin-tui] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb index 9cd1efb8e8..3f2dc3060b 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb @@ -28,3 +28,6 @@ EXTRA_OECMAKE = " -DWITH_MAN=OFF -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} BBCLASSEXTEND = "nativesdk" FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora " + +PNBLACKLIST[dnfdragora] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" + -- cgit v1.2.3-54-g00ecf