diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb')
-rw-r--r-- | meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 930ad0ea3..1116f34f4 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -11,15 +11,29 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig systemd inherit obmc-phosphor-dbus-service +# Static configuration. This is the default if no other layout is specified. +inherit ${@bb.utils.contains_any('DISTRO_FEATURES', \ + 'openpower-ubi-fs phosphor-mmc', \ + '', \ + 'openpower-software-manager-static', d)} + +# UBI layout inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-ubi-fs', \ 'openpower-software-manager-ubi', \ - 'openpower-software-manager-static', d)} + '', d)} +# eMMC layout +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'phosphor-mmc', \ + 'openpower-software-manager-mmc', \ + '', d)} + +# Virtual PNOR inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \ 'openpower-software-manager-virtual-pnor', \ '', d)} PACKAGECONFIG[verify_pnor_signature] = "--enable-verify_pnor_signature,--disable-verify_pnor_signature" PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout,--disable-ubifs_layout,,mtd-utils-ubifs" +PACKAGECONFIG[mmc_layout] = "--enable-mmc_layout,--disable-mmc_layout" PACKAGECONFIG[virtual_pnor] = "--enable-virtual_pnor,--disable-virtual_pnor" EXTRA_OECONF += " \ @@ -42,7 +56,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "4c955c31d96d4e3781abd9e9f9cf5c6aa1adfd56" +SRCREV = "7c053c3f496c73b73e7677713f3e22fb1d3e56ab" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" |