From b9be0a3c402bd29a4ebf2e1faea3a78ec62f487a Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Wed, 17 Oct 2018 15:25:25 -0700 Subject: meta-ibm: logging: ibm-logging: rename as git Rename ibm-logging.bb to _git.bb per OE norms. (From meta-ibm rev: 36afa9d2b26037052debdeea5444579953a1ae8b) Change-Id: I20136659bd3d51b8679c2785291e8aef66a00bba Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- meta-ibm/recipes-phosphor/logging/ibm-logging.bb | 79 ---------------------- .../recipes-phosphor/logging/ibm-logging_git.bb | 79 ++++++++++++++++++++++ 2 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 meta-ibm/recipes-phosphor/logging/ibm-logging.bb create mode 100644 meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb (limited to 'meta-ibm/recipes-phosphor/logging') diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging.bb deleted file mode 100644 index 2dbfc07ce8..0000000000 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "IBM enhanced error logging" -DESCRIPTION = "Adds additional error logging functionality for IBM systems" -PR = "r1" -HOMEPAGE = "https://github.com/openbmc/ibm-logging" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "5b6d0f63c3d7391ede509cd0c0bd5820d15231d4" - -inherit autotools -inherit pkgconfig -inherit pythonnative -inherit obmc-phosphor-dbus-service -inherit obmc-phosphor-systemd -inherit phosphor-dbus-yaml - -DEPENDS += " \ - ibm-dbus-interfaces \ - phosphor-logging \ - nlohmann-json \ - autoconf-archive-native \ - sdbusplus \ - " - -RDEPENDS_${PN} += " \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ - " - -S = "${WORKDIR}/git" - -SRC_URI += "file://policyTable.json" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[policy-interface] = "--enable-policy-interface, --disable-policy-interface,," - -SERVICE = "com.ibm.Logging.service" -DBUS_SERVICE_${PN} += "${SERVICE}" - -#The link is so that this service will restart if phosphor-logging restarts. -#The BindsTo in the service will not do the restart, it will only do the -#original start and a stop. -LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}" -SYSTEMD_LINK_${PN} += "${LOG_FMT}" - -do_install_append(){ - - install -d ${D}${datadir}/ibm-logging - - ${S}/condense_policy.py \ - -p ${WORKDIR}/policyTable.json \ - -c ${D}/${datadir}/ibm-logging/policy.json -} - -#An optional task to generate a report on all of the errors -#created by OpenBMC, and compare these errors to what is -#in the error policy table -do_report(){ - - ${S}/create_error_reports.py \ - -p ${D}/${datadir}/ibm-logging/policy.json \ - -y ${STAGING_DIR_NATIVE}${yaml_dir} \ - -e ${WORKDIR}/build/all_errors.json \ - -x ${WORKDIR}/build/policy_crosscheck.txt - -} - -addtask report - -#Collect all of the error YAML files into our recipe-sysroot-native dir. -do_report[depends] = " \ - ibm-logging:do_install \ - phosphor-logging-error-logs-native:do_populate_sysroot \ - phosphor-dbus-interfaces-native:do_populate_sysroot \ - openpower-dbus-interfaces-native:do_populate_sysroot \ - openpower-occ-control-native:do_populate_sysroot \ - openpower-debug-collector-native:do_populate_sysroot \ - " diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb new file mode 100644 index 0000000000..2dbfc07ce8 --- /dev/null +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -0,0 +1,79 @@ +SUMMARY = "IBM enhanced error logging" +DESCRIPTION = "Adds additional error logging functionality for IBM systems" +PR = "r1" +HOMEPAGE = "https://github.com/openbmc/ibm-logging" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +SRC_URI += "git://github.com/openbmc/ibm-logging" +SRCREV = "5b6d0f63c3d7391ede509cd0c0bd5820d15231d4" + +inherit autotools +inherit pkgconfig +inherit pythonnative +inherit obmc-phosphor-dbus-service +inherit obmc-phosphor-systemd +inherit phosphor-dbus-yaml + +DEPENDS += " \ + ibm-dbus-interfaces \ + phosphor-logging \ + nlohmann-json \ + autoconf-archive-native \ + sdbusplus \ + " + +RDEPENDS_${PN} += " \ + phosphor-logging \ + phosphor-dbus-interfaces \ + sdbusplus \ + " + +S = "${WORKDIR}/git" + +SRC_URI += "file://policyTable.json" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[policy-interface] = "--enable-policy-interface, --disable-policy-interface,," + +SERVICE = "com.ibm.Logging.service" +DBUS_SERVICE_${PN} += "${SERVICE}" + +#The link is so that this service will restart if phosphor-logging restarts. +#The BindsTo in the service will not do the restart, it will only do the +#original start and a stop. +LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}" +SYSTEMD_LINK_${PN} += "${LOG_FMT}" + +do_install_append(){ + + install -d ${D}${datadir}/ibm-logging + + ${S}/condense_policy.py \ + -p ${WORKDIR}/policyTable.json \ + -c ${D}/${datadir}/ibm-logging/policy.json +} + +#An optional task to generate a report on all of the errors +#created by OpenBMC, and compare these errors to what is +#in the error policy table +do_report(){ + + ${S}/create_error_reports.py \ + -p ${D}/${datadir}/ibm-logging/policy.json \ + -y ${STAGING_DIR_NATIVE}${yaml_dir} \ + -e ${WORKDIR}/build/all_errors.json \ + -x ${WORKDIR}/build/policy_crosscheck.txt + +} + +addtask report + +#Collect all of the error YAML files into our recipe-sysroot-native dir. +do_report[depends] = " \ + ibm-logging:do_install \ + phosphor-logging-error-logs-native:do_populate_sysroot \ + phosphor-dbus-interfaces-native:do_populate_sysroot \ + openpower-dbus-interfaces-native:do_populate_sysroot \ + openpower-occ-control-native:do_populate_sysroot \ + openpower-debug-collector-native:do_populate_sysroot \ + " -- cgit v1.2.3