diff options
| author | Marri Devender Rao <devenrao@in.ibm.com> | 2017-12-29 06:01:11 -0600 |
|---|---|---|
| committer | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-05-16 01:55:43 -0500 |
| commit | 4bdc7032c351c74047ef6b9b5e9bce3c22ce93d4 (patch) | |
| tree | 95439ae94493f49c5845f8219a32e39b2b310e4c | |
| parent | e40e3f5ebec657b6ff1bdacd6f6a2a843008ed46 (diff) | |
| download | talos-openbmc-4bdc7032c351c74047ef6b9b5e9bce3c22ce93d4.tar.gz talos-openbmc-4bdc7032c351c74047ef6b9b5e9bce3c22ce93d4.zip | |
op-occ: add native recipe to install error yaml to shared location
Extend recipe for native recipe which installs error yaml files to
shared location
Partially resolves openbmc/openbmc#2705
Change-Id: I02405a24353a565dbd34fdca06098be8337cd921
Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
2 files changed, 38 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend index f4190ef02..87f2e7deb 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend @@ -1,4 +1,5 @@ DEPENDS_append = " ${@cf_enabled(d, 'obmc-openpower', '\ openpower-debug-collector-native \ openpower-dbus-interfaces-native \ + openpower-occ-control-native \ ')}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb index ff42d60d1..f9527f123 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb @@ -69,3 +69,40 @@ HOST_ERROR_FMT = "../${OCC_DISABLE_TMPL}:${HOST_ERROR_TGTFMT}.wants/${OCC_DISABL SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_ERROR_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" S = "${WORKDIR}/git" + +# Remove packages not required for native build +DEPENDS_remove_class-native = " \ + phosphor-logging \ + obmc-targets \ + systemd \ + virtual/${PN}-config-native \ + " +# Remove packages not required for native SDK build +DEPENDS_remove_class-nativesdk = " \ + phosphor-logging \ + obmc-targets \ + systemd \ + virtual/${PN}-config-native \ + " + +# Provide a means to enable/disable install_error_yaml feature +PACKAGECONFIG ??= "install_error_yaml" +PACKAGECONFIG[install_error_yaml] = "\ + --enable-install_error_yaml,\ + --disable-install_error_yaml,\ + ,\ + " + +# Enable install_error_yaml during native and native SDK build +PACKAGECONFIG_add_class-native = "install_error_yaml" +PACKAGECONFIG_add_class-nativesdk = "install_error_yaml" + +# Disable install_error_yaml during target build +PACKAGECONFIG_remove_class-target = "install_error_yaml" + +# Disable generating elog error header file during bitbake. Applications +# should be using the elog header generated by phosphor-logging recipe +EXTRA_OECONF += "--disable-gen_errors" + +BBCLASSEXTEND += "native nativesdk" + |
