diff options
author | Patrick Venture <venture@google.com> | 2018-10-27 18:40:53 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-30 18:43:26 +0300 |
commit | 1bf12f593d2559ce4a326bc80a18c481ad79e29e (patch) | |
tree | 7a7da72b0bce9204a940cafe922f85ce9dd476a6 /meta-phosphor/recipes-phosphor/flash | |
parent | d5f36ed85b088cdcabff22d47fdbabe3772eac6a (diff) | |
download | openbmc-1bf12f593d2559ce4a326bc80a18c481ad79e29e.tar.xz |
meta-phosphor: phosphor-software-manager: drop symlink
Drop symlink and rename bb for phosphor-software-manager.
(From meta-phosphor rev: 2bb72e97b4adeaae4df141e32ec001b59a22abd3)
Change-Id: I204b0041b520c561220931c32db394971de323c7
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/flash')
-rw-r--r-- | meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.bb | 104 | ||||
-rw-r--r--[l---------] | meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb | 106 |
2 files changed, 105 insertions, 105 deletions
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.bb deleted file mode 100644 index 0b6723c89..000000000 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.bb +++ /dev/null @@ -1,104 +0,0 @@ -SUMMARY = "Phosphor Software Management" -DESCRIPTION = "Phosphor Software Manager provides a set of system software \ -management daemons. It is suitable for use on a wide variety of OpenBMC \ -platforms." -PR = "r1" - -require ${PN}.inc - -SOFTWARE_MGR_PACKAGES = " \ - ${PN}-version \ - ${PN}-download-mgr \ - ${PN}-updater \ - ${PN}-updater-ubi \ - ${PN}-sync \ -" -PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" - -DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" - -# Set SYSTEMD_PACKAGES to empty because we do not want ${PN} and DBUS_PACKAGES -# handles the rest. -SYSTEMD_PACKAGES = "" - -PACKAGECONFIG[verify_signature] = "--enable-verify_signature,--disable-verify_signature" -PACKAGECONFIG[sync_bmc_files] = "--enable-sync_bmc_files,--disable-sync_bmc_files" -PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout" - -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 \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - sdbus++-native \ -" - -RDEPENDS_${PN}-version += " \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ -" -RDEPENDS_${PN}-download-mgr += " \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ -" -RDEPENDS_${PN}-updater += " \ - bash \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ - virtual-obmc-image-manager \ -" -EXTRA_OECONF += " \ - ACTIVE_BMC_MAX_ALLOWED=1 \ - MEDIA_DIR=/run/media \ -" - -RPROVIDES_${PN}-version += " \ - virtual-obmc-image-manager \ -" - -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 \ - " -FILES_${PN}-sync += " \ - ${sbindir}/phosphor-sync-software-manager \ - ${sysconfdir}/synclist \ - " -DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.Version.service" -DBUS_SERVICE_${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" -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-setenv@.service \ -" - -SRC_URI += "file://software.conf" -SRC_URI += "file://obmc-flash-bmc" - -do_install_append() { - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/obmc-flash-bmc ${D}${sbindir}/obmc-flash-bmc - - # /tmp/images is the software image upload directory. - # It should not be deleted since it is watched by the Image Manager - # for new images. - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true', 'false', d)}; then - install -d ${D}${exec_prefix}/lib/tmpfiles.d - install -m 644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/ - fi -} - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index 04937d3ac..4637651ef 120000..100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -1 +1,105 @@ -phosphor-software-manager.bb
\ No newline at end of file +SUMMARY = "Phosphor Software Management" +DESCRIPTION = "Phosphor Software Manager provides a set of system software \ +management daemons. It is suitable for use on a wide variety of OpenBMC \ +platforms." +PR = "r1" +PV = "1.0+git${SRCPV}" + +require ${PN}.inc + +SOFTWARE_MGR_PACKAGES = " \ + ${PN}-version \ + ${PN}-download-mgr \ + ${PN}-updater \ + ${PN}-updater-ubi \ + ${PN}-sync \ +" +PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" +ALLOW_EMPTY_${PN} = "1" + +DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" + +# Set SYSTEMD_PACKAGES to empty because we do not want ${PN} and DBUS_PACKAGES +# handles the rest. +SYSTEMD_PACKAGES = "" + +PACKAGECONFIG[verify_signature] = "--enable-verify_signature,--disable-verify_signature" +PACKAGECONFIG[sync_bmc_files] = "--enable-sync_bmc_files,--disable-sync_bmc_files" +PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout" + +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 \ + sdbusplus \ + phosphor-dbus-interfaces \ + phosphor-logging \ + sdbus++-native \ +" + +RDEPENDS_${PN}-version += " \ + phosphor-logging \ + phosphor-dbus-interfaces \ + sdbusplus \ +" +RDEPENDS_${PN}-download-mgr += " \ + phosphor-logging \ + phosphor-dbus-interfaces \ + sdbusplus \ +" +RDEPENDS_${PN}-updater += " \ + bash \ + phosphor-logging \ + phosphor-dbus-interfaces \ + sdbusplus \ + virtual-obmc-image-manager \ +" +EXTRA_OECONF += " \ + ACTIVE_BMC_MAX_ALLOWED=1 \ + MEDIA_DIR=/run/media \ +" + +RPROVIDES_${PN}-version += " \ + virtual-obmc-image-manager \ +" + +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 \ + " +FILES_${PN}-sync += " \ + ${sbindir}/phosphor-sync-software-manager \ + ${sysconfdir}/synclist \ + " +DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.Version.service" +DBUS_SERVICE_${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" +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-setenv@.service \ +" + +SRC_URI += "file://software.conf" +SRC_URI += "file://obmc-flash-bmc" + +do_install_append() { + install -d ${D}${sbindir} + install -m 0755 ${WORKDIR}/obmc-flash-bmc ${D}${sbindir}/obmc-flash-bmc + + # /tmp/images is the software image upload directory. + # It should not be deleted since it is watched by the Image Manager + # for new images. + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true', 'false', d)}; then + install -d ${D}${exec_prefix}/lib/tmpfiles.d + install -m 644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/ + fi +} + +S = "${WORKDIR}/git" |