From 20fd15d48ab8c6bf297a49cae11da4e41615d01c Mon Sep 17 00:00:00 2001
From: "P.K. Lee"
Date: Wed, 31 Jul 2019 13:48:02 +0800
Subject: meta-quanta: gsj: remove gbmc-psu-hardreset.target from
google-ipmi-sys
Remove gbmc-psu-hardreset.target from google-ipmi-sys to get
DelayHardReset to return the expected unspecified error.
(From meta-quanta rev: c95abb8caea6e56de78f009338ed656518928566)
Signed-off-by: P.K. Lee
Change-Id: I910d976c0b37b88523e3351ad83ce60124cd28df
Signed-off-by: Brad Bishop
---
meta-quanta/meta-gsj/conf/bblayers.conf.sample | 2 ++
meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend | 6 ++++++
.../meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 +
3 files changed, 9 insertions(+)
create mode 100644 meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend
(limited to 'meta-quanta')
diff --git a/meta-quanta/meta-gsj/conf/bblayers.conf.sample b/meta-quanta/meta-gsj/conf/bblayers.conf.sample
index f28a8ba77..be7a73873 100644
--- a/meta-quanta/meta-gsj/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-gsj/conf/bblayers.conf.sample
@@ -12,6 +12,7 @@ BBLAYERS ?= " \
##OEROOT##/meta-openembedded/meta-python \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-nuvoton \
+ ##OEROOT##/meta-google \
##OEROOT##/meta-quanta \
##OEROOT##/meta-quanta/meta-gsj \
"
@@ -22,6 +23,7 @@ BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta-openembedded/meta-python \
##OEROOT##/meta-phosphor \
##OEROOT##/meta-nuvoton \
+ ##OEROOT##/meta-google \
##OEROOT##/meta-quanta \
##OEROOT##/meta-quanta/meta-gsj \
"
diff --git a/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend b/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend
new file mode 100644
index 000000000..11e4b7172
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend
@@ -0,0 +1,6 @@
+NETIPMI_PROVIDER_LIBRARY_gsj += "libsyscmds.so"
+SYSTEMD_SERVICE_${PN}_remove_gsj = "gbmc-psu-hardreset.target"
+
+do_install_append_gsj() {
+ rm -rf ${D}/lib
+}
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 60de2fcd4..9950401c6 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,3 +1,4 @@
OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-ipmi-flash"
OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-pid-control"
OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " detect-fan-fail"
+OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys"
--
cgit v1.2.3