From a30470fe5302f6eb35bc961bf644f6ec03fa44fa Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 9 Feb 2018 12:50:57 -0800 Subject: Don't load non-UBI flash packages on UBI systems Two un-needed applications are getting installed and started on UBI enabled systems: - download_manager.py (obmc-mgr-download.bb) - bmc_update.py (obmc-flash-bmc.bb) Remove these if it is a BMC UBI enabled system. Moved all of the BMC flash logic to the phosphor layer where it really belongs since the ability to update your OpenBMC should come by default when bringing in phosphor. Tested: Verified 2 python applications not present on witherspoon and system boots and code updates fine. Verified romulus image still had python applications and made it to Ready states. Resolves openbmc/openbmc#2480 Change-Id: I42317ece1b75fd6bb05e766e486dfecdb7d4ccf3 Signed-off-by: Andrew Geissler --- meta-phosphor/conf/distro/include/phosphor-defaults.inc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta-phosphor/conf') diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 5387f93d8..3158c8f74 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -83,6 +83,12 @@ VIRTUAL-RUNTIME_obmc-leds-sysfs ?= "phosphor-led-sysfs" # interface. VIRTUAL-RUNTIME_obmc-bmc-download-mgr ?= "phosphor-software-manager-download-mgr" +# obmc-bmc-version +# +# Provides an implementation of the xyz.openbmc_project.Software.Version +# interface. +VIRTUAL-RUNTIME_obmc-bmc-version ?= "phosphor-software-manager-version" + # obmc-bmc-updater # # Provides an implementation of the xyz.openbmc_project.Software.Activation -- cgit v1.2.3