diff options
3 files changed, 53 insertions, 45 deletions
diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass new file mode 100644 index 000000000..0e62023da --- /dev/null +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -0,0 +1,49 @@ +# UBI-specific configuration for the phosphor-manager-software package + +RDEPENDS_phosphor-software-manager-updater-ubi += " \ + bash \ + mtd-utils-ubifs \ +" + +FILES_${PN}-updater-ubi += " \ + ${sbindir}/obmc-flash-bmc \ + /usr/local \ + " + +SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \ + 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 \ + obmc-flash-bmc-ubiremount.service \ + obmc-flash-bmc-updateubootvars@.service \ + obmc-flash-bmc-cleanup.service \ + obmc-flash-bmc-mirroruboot.service \ + reboot-guard-enable.service \ + reboot-guard-disable.service \ + usr-local.mount \ +" + +# 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" +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 +} diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb index 996785cac..684f631f4 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -11,6 +11,7 @@ SOFTWARE_MGR_PACKAGES = " \ ${PN}-version \ ${PN}-download-mgr \ ${PN}-updater \ + ${PN}-updater-ubi \ ${PN}-sync \ " PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" @@ -28,6 +29,7 @@ PACKAGECONFIG[sync_bmc_files] = "--enable-sync_bmc_files,--disable-sync_bmc_file 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 @@ RDEPENDS_${PN}-updater += " \ 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 @@ RPROVIDES_${PN}-version += " \ 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}-download-mgr += "xyz.openbmc_project.Software.Download.servic 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/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 2199e0389..56d78d138 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -97,6 +97,7 @@ ${PN}-software-extras = " \ ${PN}-software-extras_df-obmc-ubi-fs = " \ phosphor-image-signing \ + phosphor-software-manager-updater-ubi \ " SUMMARY_${PN}-software = "Software applications" |