diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-09 00:40:41 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-12 22:51:39 -0400 |
commit | 09806a566ce7af38691ec9a9b9c26ebe3463f746 (patch) | |
tree | 1f5211c9109e11e51538f7c956da208e5784bff8 /meta-openbmc-machines | |
parent | 8623bbe4d4a187018cc3c265aaca5fa05b78d13b (diff) | |
download | talos-openbmc-09806a566ce7af38691ec9a9b9c26ebe3463f746.tar.gz talos-openbmc-09806a566ce7af38691ec9a9b9c26ebe3463f746.zip |
Convert openpower-ubi-fs to a distro feature
As with MRW the use of the UBI image scheme is distro policy.
Convert the existing machine feature to a distro feature.
Enable the new distro feature on the systems that use
it(Witherspoon).
Add a distro override and fix-up MF checks to use this override
instead for improved readability.
Change-Id: I57f3bc244523eff5bc043caff8365e334d98cb30
Tested: Built a witherspoon image and validate manifest
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines')
5 files changed, 13 insertions, 7 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend index 751940467..e576d8e6c 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend @@ -1,11 +1,11 @@ -SRC_URI += "${@mf_enabled(d, 'openpower-ubi-fs', 'file://software.conf')}" +SRC_URI += "${@df_enabled(d, 'openpower-ubi-fs', 'file://software.conf')}" install_tmpfile() { # /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('MACHINE_FEATURES', 'openpower-ubi-fs', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-ubi-fs', 'true', 'false', d)}; then install -m 0644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/ fi } diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index d4e8d2032..b3783d87f 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -45,10 +45,15 @@ RDEPENDS_${PN}-fans = " \ SUMMARY_${PN}-flash = "OpenPOWER Flash" RDEPENDS_${PN}-flash = " \ obmc-control-bmc \ - ${@mf_enabled(d, 'openpower-ubi-fs', \ - 'openpower-software-manager', \ - 'obmc-flash-bios obmc-mgr-download obmc-op-flasher')} \ + obmc-flash-bios \ + obmc-mgr-download \ + obmc-op-flasher \ " +RDEPENDS_${PN}-flash_df-openpower-ubi-fs = " \ + obmc-control-bmc \ + openpower-software-manager \ + " + SUMMARY_${PN}-system = "OpenPOWER System" RDEPENDS_${PN}-system = " \ diff --git a/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-ubi.inc b/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-ubi.inc new file mode 100644 index 000000000..cb488c830 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-ubi.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "openpower-ubi-fs" +DISTROOVERRIDES .= ":df-openpower-ubi-fs" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf index c00930a2b..543e7f9da 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf @@ -1,3 +1,4 @@ require conf/distro/include/phosphor-base.inc require conf/distro/include/phosphor-ubi.inc require conf/distro/include/openpower-mrw.inc +require conf/distro/include/openpower-ubi.inc diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index 13831a731..75ef28738 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -3,8 +3,6 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" UBOOT_MACHINE = "ast_g5_ncsi_config" -OBMC_MACHINE_FEATURES += "openpower-ubi-fs" - OBMC_POWER_SUPPLY_INSTANCES = "0 1" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' |