meta-phosphor: packagegroup-obmc-apps: simplify software package
Eliminate the variable indirection for the package content.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I016e6aa370e7d62e20484af4e91250b38c4c01a0
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index fe68359..a27dce5 100644
--- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -44,7 +44,7 @@
RDEPENDS:${PN}-leds:remove:witherspoon-tacoma = "phosphor-led-manager-faultmonitor"
RDEPENDS:${PN}-devtools:remove:witherspoon = "rsync"
-${PN}-software-extras:append:ibm-ac-server = " phosphor-software-manager-sync"
-${PN}-software-extras:append:p10bmc = " phosphor-software-manager-usb"
-${PN}-software-extras:append:p10bmc = " phosphor-software-manager-side-switch"
-${PN}-software-extras:append:system1 = " phosphor-software-manager-side-switch"
+RDEPENDS:${PN}-software:append:ibm-ac-server = " phosphor-software-manager-sync"
+RDEPENDS:${PN}-software:append:p10bmc = " phosphor-software-manager-usb"
+RDEPENDS:${PN}-software:append:p10bmc = " phosphor-software-manager-side-switch"
+RDEPENDS:${PN}-software:append:system1 = " phosphor-software-manager-side-switch"
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 37061fc..48b4816 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -148,22 +148,17 @@
${VIRTUAL-RUNTIME_obmc-sensors-hwmon} \
"
-${PN}-software-extras = ""
-
-${PN}-software-extras:df-obmc-ubi-fs = " \
- phosphor-software-manager-updater-ubi \
- "
-
-${PN}-software-extras:df-phosphor-mmc = " \
- phosphor-software-manager-updater-mmc \
- "
-
SUMMARY:${PN}-software = "Software applications"
RDEPENDS:${PN}-software = " \
phosphor-software-manager-download-mgr \
phosphor-software-manager-updater \
phosphor-software-manager-version \
- ${${PN}-software-extras} \
+ "
+RDEPENDS:${PN}-software:append:df-obmc-ubi-fs = " \
+ phosphor-software-manager-updater-ubi \
+ "
+RDEPENDS:${PN}-software:append:df-phosphor-mmc = " \
+ phosphor-software-manager-updater-mmc \
"
SUMMARY:${PN}-debug-collector = "BMC debug collector"