meta-google: remove glome-config from glome's RDEPENDS
glome-config only provides the config file for glome. It is more
appropriate to decouple them by adding glome-config to
OBMC_IMAGE_EXTRA_INSTALL in the meta-google layer. Then when glome is
migrated to another meta layer, it won't need this RDEPENDS.
(This is a follow-up of
https://gerrit.openbmc.org/c/openbmc/openbmc/+/56618/)
Also add glome-login to OBMC_IMAGE_EXTRA_INSTALL since it is also
needed.
Tested:
Built an image and run it on a real machine. Verified that glome is
enabled and the generated link gave a valid password.
Signed-off-by: Leo Tu <leotu@google.com>
Change-Id: I985670454f4749c5297261ec81466fed9cdc5c40
diff --git a/meta-google/recipes-google/console/glome_git.bb b/meta-google/recipes-google/console/glome_git.bb
index 418179f..8940a83 100644
--- a/meta-google/recipes-google/console/glome_git.bb
+++ b/meta-google/recipes-google/console/glome_git.bb
@@ -12,7 +12,6 @@
openssl \
glome-config \
"
-RDEPENDS:${PN} += "glome-config"
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/google/glome.git;branch=master;protocol=https"
diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 88a40d1..570493b 100644
--- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -3,6 +3,9 @@
OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-blobs"
OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-ethstats"
OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-flash"
+OBMC_IMAGE_EXTRA_INSTALL:append = \
+ '${@bb.utils.contains_any("MACHINE_FEATURES", "glome", \
+ " glome-config glome-login", "", d)}'
# Google BMC (gBMC) specific installs
OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " iproute2 iproute2-ss"