bmcweb: enable google-baremetal for gbmc-baremetal Platforms having bare-metal feature should only need to add: - gbmc-baremetal to MACHINE_FEATURES in conf files. - config the require setting in the setup bb file. Tested: ``` // the option is still disabled for a random platform. bitbake -e bmcweb | grep EXTRA_OEMESON= ... -Dgoogle-baremetal=disabled ... // also no bare-metal-setup in `bitbake -e obmc-phosphor-image | grep // OBMC_IMAGE_EXTRA_INSTALL=` // the option is enabled for a platform with adding machine features. bitbake -e bmcweb | grep EXTRA_OEMESON= ... -Dgoogle-baremetal=enabled ... // also bare-metal-setup in `bitbake -e obmc-phosphor-image | grep // OBMC_IMAGE_EXTRA_INSTALL=` ``` Google-Bug-Id: 327596841 Signed-off-by: Tom Tung <tomtung@google.com> Change-Id: I17293852f40eaa3bf9c6e711eafab0a8e5debd6b Signed-off-by: Tom Tung <tomtung@google.com>
diff --git a/recipes-phosphor/images/obmc-phosphor-image.bbappend b/recipes-phosphor/images/obmc-phosphor-image.bbappend index b216b55..0c62b8f 100644 --- a/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -2,3 +2,11 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-hosts-gen" OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-dump-ramoops" OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " coredump-config" +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = '${@bb.utils.contains("MACHINE_FEATURES", "gbmc-baremetal", \ + " bare-metal-setup", "", d)}' +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = '${@bb.utils.contains("MACHINE_FEATURES", "gbmc-baremetal", \ + " bare-metal-gpio-monitor", "", d)}' +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = '${@bb.utils.contains("MACHINE_FEATURES", "gbmc-baremetal", \ + " bare-metal-ipmi-kcs", "", d)}' +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = '${@bb.utils.contains("MACHINE_FEATURES", "gbmc-baremetal", \ + " bare-metal-obmc-console", "", d)}'
diff --git a/recipes-phosphor/interfaces/bmcweb_%.bbappend b/recipes-phosphor/interfaces/bmcweb_%.bbappend index cdfb6c5..f3771f1 100644 --- a/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -15,7 +15,7 @@ " EXTRA_OEMESON:append:gbmc:gbmcfork = " \ - -Dgoogle-baremetal=disabled \ + ${@bb.utils.contains('MACHINE_FEATURES', 'gbmc-baremetal', '-Dgoogle-baremetal=enabled', '-Dgoogle-baremetal=disabled', d)} \ " SRC_URI:append:gbmc = " \