From 35e295e2a161fcf146ea031de53431b2888521fa Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 19 Aug 2019 11:16:19 -0700 Subject: Sync to internal 8-19-2019 Signed-off-by: Ed Tanous --- .../recipes-core/at-scale-debug/at-scale-debug.bb | 26 ---------------------- .../at-scale-debug/at-scale-debug_git.bb | 26 ++++++++++++++++++++++ .../recipes-core/crashdump/crashdump_git.bb | 14 +++++++----- .../host-error-monitor/host-error-monitor_git.bb | 2 +- .../recipes-core/ipmi/intel-ipmi-oem_%.bbappend | 2 +- .../recipes-core/peci-pcie/peci-pcie_git.bb | 2 +- 6 files changed, 37 insertions(+), 35 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb create mode 100644 meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb (limited to 'meta-openbmc-mods/meta-common/recipes-core') diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb deleted file mode 100644 index 5576c84c7..000000000 --- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb +++ /dev/null @@ -1,26 +0,0 @@ -inherit obmc-phosphor-systemd - -SUMMARY = "At Scale Debug Service" -DESCRIPTION = "At Scale Debug Service exposes remote JTAG target debug capabilities" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0d1c657b2ba1e8877940a8d1614ec560" - - -inherit cmake -DEPENDS = "sdbusplus openssl libpam" - -do_configure[depends] += "virtual/kernel:do_shared_workdir" - -SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" - -SRCREV = "bf2736cb1c8959164f989f59c4337a0ff108b13f" -S = "${WORKDIR}/git" - -SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service" - -# Specify any options you want to pass to cmake using EXTRA_OECMAKE: -EXTRA_OECMAKE = "-DBUILD_UT=OFF" - -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/" diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb new file mode 100644 index 000000000..170f41a94 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb @@ -0,0 +1,26 @@ +inherit obmc-phosphor-systemd + +SUMMARY = "At Scale Debug Service" +DESCRIPTION = "At Scale Debug Service exposes remote JTAG target debug capabilities" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0d1c657b2ba1e8877940a8d1614ec560" + + +inherit cmake +DEPENDS = "sdbusplus openssl libpam" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +SRC_URI = "git://git@github.com/Intel-BMC/asd;protocol=ssh;nobranch=1" +SRCREV = "73d4cc11b859ba91f313a7bb85f2dbb26e36d0ee" + +S = "${WORKDIR}/git" + +SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service" + +# Specify any options you want to pass to cmake using EXTRA_OECMAKE: +EXTRA_OECMAKE = "-DBUILD_UT=OFF" + +CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" +CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/" diff --git a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb index 63f65e03d..68a548b02 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb @@ -4,16 +4,18 @@ inherit obmc-phosphor-systemd SUMMARY = "CPU Crashdump" DESCRIPTION = "CPU utilities for dumping CPU Crashdump and registers over PECI" -DEPENDS = "boost cjson sdbusplus safec " +DEPENDS = "boost cjson sdbusplus safec gtest " inherit cmake -LICENSE = "CLOSED" -LIC_FILES_CHKSUM = "" +EXTRA_OECMAKE = "-DCRASHDUMP_BUILD_UT=ON" -SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" -SRCREV = "bf2736cb1c8959164f989f59c4337a0ff108b13f" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://LICENSE;md5=26bb6d0733830e7bab774914a8f8f20a" -S = "${WORKDIR}/git/crashdump" +SRC_URI = "git://git@github.com/Intel-BMC/crashdump;protocol=ssh;nobranch=1" +SRCREV = "c99e4fb7727545501fe65b90a8a97e84d469d45e" + +S = "${WORKDIR}/git" PACKAGES += "libpeci" SYSTEMD_SERVICE_${PN} += "com.intel.crashdump.service" diff --git a/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb index 1733ac428..483a9bf12 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb @@ -7,7 +7,7 @@ SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" DEPENDS = "boost sdbusplus libgpiod" PV = "0.1+git${SRCPV}" -SRCREV = "bf2736cb1c8959164f989f59c4337a0ff108b13f" +SRCREV = "6ed87657134c7379da1febcccd5d87617c702347" S = "${WORKDIR}/git/host_error_monitor" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend index e79a42fcd..53fc218c6 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend @@ -1,2 +1,2 @@ SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "6ae0818f82bcfc6c5568dd2107d0656da5410f61" +SRCREV = "773703a58db91f69f2ecb32d3c69d9984fba504e" diff --git a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb index 01ef73964..e19e5fc93 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" DEPENDS = "boost sdbusplus crashdump" PV = "0.1+git${SRCPV}" -SRCREV = "bf2736cb1c8959164f989f59c4337a0ff108b13f" +SRCREV = "6ed87657134c7379da1febcccd5d87617c702347" S = "${WORKDIR}/git/peci_pcie" -- cgit v1.2.3