phosphor-software-manager: Create new UBI bbclass
Remove from the base phosphor-software-manager recipe everything
that is conditional in the ubi-fs distro feature and put it
in its own class.
This allows for the base recipe to be cleaner and for future
specific packages to be added conditionally.
Tested: Built witherspoon and romulus and verified only
witherspoon contained the UBI-specific files.
Booted a witherspoon and a romulus qemu.
Change-Id: I2a783abc6152aadcf212a35f0060409f8dac2241
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/common/recipes-phosphor/flash/phosphor-software-manager.bb b/common/recipes-phosphor/flash/phosphor-software-manager.bb
index 996785c..684f631 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -11,6 +11,7 @@
${PN}-version \
${PN}-download-mgr \
${PN}-updater \
+ ${PN}-updater-ubi \
${PN}-sync \
"
PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}"
@@ -28,6 +29,7 @@
inherit autotools pkgconfig
inherit obmc-phosphor-dbus-service
inherit pythonnative
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'phosphor-software-manager-ubi-fs', '', d)}
DEPENDS += " \
autoconf-archive-native \
@@ -52,10 +54,6 @@
phosphor-dbus-interfaces \
sdbusplus \
virtual-obmc-image-manager \
- bash \
-"
-RDEPENDS_${PN}-updater_append_df-obmc-ubi-fs = " \
- mtd-utils-ubifs \
"
RPROVIDES_${PN}-version += " \
@@ -64,11 +62,7 @@
FILES_${PN}-version += "${sbindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf"
FILES_${PN}-download-mgr += "${sbindir}/phosphor-download-manager"
-FILES_${PN}-updater += " \
- ${sbindir}/phosphor-image-updater \
- ${sbindir}/obmc-flash-bmc \
- /usr/local \
- "
+FILES_${PN}-updater += "${sbindir}/phosphor-image-updater"
FILES_${PN}-sync += " \
${sbindir}/phosphor-sync-software-manager \
${sysconfdir}/synclist \
@@ -78,45 +72,9 @@
DBUS_SERVICE_${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service"
DBUS_SERVICE_${PN}-sync += "xyz.openbmc_project.Software.Sync.service"
-SYSTEMD_SERVICE_${PN}-updater += " \
- obmc-flash-bmc-ubirw.service \
- obmc-flash-bmc-ubiro@.service \
- obmc-flash-bmc-setenv@.service \
- obmc-flash-bmc-ubirw-remove.service \
- obmc-flash-bmc-ubiro-remove@.service \
- usr-local.mount \
- obmc-flash-bmc-ubiremount.service \
- obmc-flash-bmc-updateubootvars@.service \
- reboot-guard-enable.service \
- reboot-guard-disable.service \
- obmc-flash-bmc-cleanup.service \
- obmc-flash-bmc-mirroruboot.service \
- "
-
-# Name of the mtd device where the ubi volumes should be created
-BMC_RW_MTD ??= "bmc"
-BMC_RO_MTD ??= "bmc"
-BMC_KERNEL_MTD ??= "bmc"
-BMC_RW_SIZE ??= "0x600000"
-SYSTEMD_SUBSTITUTIONS += "RW_MTD:${BMC_RW_MTD}:obmc-flash-bmc-ubirw.service"
-SYSTEMD_SUBSTITUTIONS += "RO_MTD:${BMC_RO_MTD}:obmc-flash-bmc-ubiro@.service"
-SYSTEMD_SUBSTITUTIONS += "KERNEL_MTD:${BMC_KERNEL_MTD}:obmc-flash-bmc-ubiro@.service"
-SYSTEMD_SUBSTITUTIONS += "RW_SIZE:${BMC_RW_SIZE}:obmc-flash-bmc-ubirw.service"
-
-SRC_URI += "file://obmc-flash-bmc"
-SRC_URI += "file://synclist"
SRC_URI += "file://software.conf"
do_install_append() {
- install -d ${D}${sbindir}
- install -m 0755 ${WORKDIR}/obmc-flash-bmc ${D}${sbindir}/obmc-flash-bmc
- install -d ${D}/usr/local
-
- if [ -f ${WORKDIR}/build/phosphor-sync-software-manager ]; then
- install -d ${D}${sysconfdir}
- install -m 0644 ${WORKDIR}/synclist ${D}${sysconfdir}/synclist
- fi
-
# /tmp/images is the software image upload directory.
# It should not be deleted since it is watched by the Image Manager
# for new images.
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 2199e03..56d78d1 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -97,6 +97,7 @@
${PN}-software-extras_df-obmc-ubi-fs = " \
phosphor-image-signing \
+ phosphor-software-manager-updater-ubi \
"
SUMMARY_${PN}-software = "Software applications"