From a13d0785028ff09e62f1c8b29a2f5ce10fa1bbe8 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Thu, 7 Jan 2021 11:52:01 -0800 Subject: Remove packagegroup-core-device-devel for qemu Upstream yocto removed these parameters in this commit: d707fa30f8a24d1e50831846330757254f245791 packagegroup-core-device-devel: remove https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=d707fa30f8a24d1e50831846330757254f245791 and now builds against a qemu machine fail to build. This commit removes phosphors use of these items, as it isn't clear what they were doing for us anyway, which the aformentioned commit also asserts. (From meta-phosphor rev: 933b75141f46cefe838f298f793f7d49c9f1f2b3) Signed-off-by: Ed Tanous Change-Id: I2c9ab4ade1ac1926094da9102ac2c047baa147e0 Signed-off-by: Andrew Geissler --- meta-phosphor/conf/distro/include/phosphor-base.inc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 93b24550c..b1b3885c4 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -10,14 +10,6 @@ DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" DISTROOVERRIDES .= ":openbmc-phosphor" -POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "packagegroup-core-device-devel",d)}" -DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" -DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}" -DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" -DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}" -DISTRO_EXTRA_RDEPENDS_append_qemux86 = " ${POKYQEMUDEPS}" -DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}" - TCLIBCAPPEND = "" QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el nios2 ppc x86_64" -- cgit v1.2.3