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>
diff --git a/meta-openpower/classes/openpower-software-manager-ubi.bbclass b/meta-openpower/classes/openpower-software-manager-ubi.bbclass
index 7ff62be..7167b88 100644
--- a/meta-openpower/classes/openpower-software-manager-ubi.bbclass
+++ b/meta-openpower/classes/openpower-software-manager-ubi.bbclass
@@ -7,7 +7,6 @@
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 0000000..c83f4aa
--- /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 093a7ad..2beb761 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 ${@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 @@
SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt"
-SRCREV = "85f25407598494d8f91890df5152501680a067dd"
+SRCREV = "f3dfe65de8487364c21b7b49396cf912821ea339"
DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service"