From ef12c506d04c642f21c17aa9d50f0e54d3ea7a40 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 1 Mar 2017 15:33:25 -0500 Subject: leds: Make phosphor-led-manager-config native phosphor-led-manager-config is a meta-recipe that pulls in other native recipes based on mrw enablement. Switch from being a target recipe to a native recipe. A native recipe is more appropriate since a target recipe will cause bitbake to create -dev packages and attempt to install those into an SDK. Change-Id: I42af0796960cefe19d182afb2957e5c4853c6d28 Signed-off-by: Brad Bishop --- .../leds/phosphor-led-manager-config-native.bb | 19 +++++++++++++++++++ .../leds/phosphor-led-manager-config.bb | 18 ------------------ .../recipes-phosphor/leds/phosphor-led-manager.bb | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-native.bb delete mode 100644 meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config.bb (limited to 'meta-phosphor/common') diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-native.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-native.bb new file mode 100644 index 000000000..73812eab5 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Phosphor LED Group Management meta data" +PR = "r1" + +inherit obmc-phosphor-utils +inherit obmc-phosphor-license +inherit native + +# Default is the example set of data. +PHOSPHOR_LED_MANAGER_CONFIG ??= "${BPN}-example-native" + +# Choose appropriate yaml file +def get_depends(d): + if d.getVar('USE_MRW', 'yes'): + return "${BPN}-mrw-native" + else: + return "${PHOSPHOR_LED_MANAGER_CONFIG}" + +USE_MRW = "${@cf_enabled(d, 'obmc-mrw', 'yes')}" +DEPENDS += "${@get_depends(d)}" diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config.bb deleted file mode 100644 index 7d4b81a31..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Phosphor LED Group Management meta data" -PR = "r1" - -inherit obmc-phosphor-utils -inherit obmc-phosphor-license - -# Default is the example set of data. -PHOSPHOR_LED_MANAGER_CONFIG ??= "${PN}-example-native" - -# Choose appropriate yaml file -def get_depends(d): - if d.getVar('USE_MRW', 'yes'): - return "${PN}-mrw-native" - else: - return "${PHOSPHOR_LED_MANAGER_CONFIG}" - -USE_MRW = "${@cf_enabled(d, 'obmc-mrw', 'yes')}" -DEPENDS += "${@get_depends(d)}" diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb index 4757aa850..54996f999 100644 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb @@ -9,7 +9,7 @@ require ${PN}.inc DEPENDS += "python-pyyaml-native" DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "${PN}-config" +DEPENDS += "${PN}-config-native" RDEPENDS_${PN} += "libsystemd" S = "${WORKDIR}/git" -- cgit v1.2.1