diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2019-10-25 23:24:38 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-11 15:49:52 +0300 |
| commit | 8b805bde5042f9342af59cd5c041968de5e908a7 (patch) | |
| tree | 82354f589977405de1616f3ee0c58c07a31fde18 | |
| parent | 7c58538f2942918c188b204752b455d91dcf83d5 (diff) | |
| download | openbmc-8b805bde5042f9342af59cd5c041968de5e908a7.tar.xz | |
openpower-software-manager: New virtual pnor bbclass
Create a new virtual pnor bbclass to hold the updatesymlinks systemd
service file. This service file was moved because it doesn't depend
on the filesystem layout. Enable it if the virtual-pnor distro feature
is selected.
Tested: Verified the service file was still present on witherspoon
since the virtual pnor distro feature is part of ubi.
(From meta-openpower rev: 86c282465aa3d601fcc949233049558ee6851d30)
Change-Id: Id2d91e5bbcce93ed6d8c6750a0fa54fcf5a9615b
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
3 files changed, 10 insertions, 2 deletions
diff --git a/meta-openpower/classes/openpower-software-manager-ubi.bbclass b/meta-openpower/classes/openpower-software-manager-ubi.bbclass index 7ff62be57..7167b88c3 100644 --- a/meta-openpower/classes/openpower-software-manager-ubi.bbclass +++ b/meta-openpower/classes/openpower-software-manager-ubi.bbclass @@ -7,7 +7,6 @@ SYSTEMD_SERVICE_${PN} += " \ obmc-flash-bios-ubiumount-rw@.service \ obmc-flash-bios-ubipatch.service \ obmc-flash-bios-ubiremount.service \ - obmc-flash-bios-updatesymlinks.service \ obmc-flash-bios-cleanup.service \ obmc-flash-bios-enable-clearvolatile@.service \ obmc-flash-bios-check-clearvolatile@.service \ diff --git a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass new file mode 100644 index 000000000..c83f4aa1c --- /dev/null +++ b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass @@ -0,0 +1,5 @@ +PACKAGECONFIG_append = " virtual_pnor" + +SYSTEMD_SERVICE_${PN} += " \ + obmc-vpnor-updatesymlinks.service \ + " 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 093a7adcf..2beb76192 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -15,9 +15,13 @@ inherit pythonnative inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-ubi-fs', \ 'openpower-software-manager-ubi', \ 'openpower-software-manager-static', d)} +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[virtual_pnor] = "--enable-virtual_pnor,--disable-virtual_pnor" EXTRA_OECONF += " \ PNOR_MSL="v2.0.10 v2.2" \ @@ -39,7 +43,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "85f25407598494d8f91890df5152501680a067dd" +SRCREV = "f3dfe65de8487364c21b7b49396cf912821ea339" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" |