Move bmcweb options to meta-ibm
These options don't have anything to do with POWER architecture, they
are ibm options so move them to meta-ibm.
The options are:
-Dredfish-dbus-log=enabled \
-Dhttp-body-limit=400 \
and control the body limit, allowing a larger code update image and the
use of phosphor-logging.
This gives the added bonus of all meta-ibm bmcweb options are in one
place and removes these from 2 non-openpower, ibm systems.
Tested: It builds. No other testing.
Change-Id: Ief31f1bfd8a92720b43b4124c6b25c582231a558
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 7b51944..5253fe9 100644
--- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -5,6 +5,8 @@
-Dredfish-oem-manager-fan-data=disabled \
-Dredfish-bmc-journal=disabled \
-Dinsecure-enable-redfish-query=enabled \
+ -Dredfish-dbus-log=enabled \
+ -Dhttp-body-limit=400 \
"
EXTRA_OEMESON:append:p10bmc = " \
@@ -19,16 +21,6 @@
"
PACKAGECONFIG:remove:witherspoon-tacoma = "mutual-tls-auth"
-EXTRA_OEMESON:append:system1 = " \
- -Dhttp-body-limit=400 \
- -Dredfish-dbus-log=enabled \
-"
-
-EXTRA_OEMESON:append:sbp1 = " \
- -Dhttp-body-limit=400 \
- -Dredfish-dbus-log=enabled \
-"
-
inherit obmc-phosphor-discovery-service
REGISTERED_SERVICES:${PN} += "obmc_redfish:tcp:443:"
diff --git a/meta-openpower/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openpower/recipes-phosphor/interfaces/bmcweb_%.bbappend
deleted file mode 100644
index 7390574..0000000
--- a/meta-openpower/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_OEMESON:append:df-openpower = " \
- -Dredfish-dbus-log=enabled \
- -Dhttp-body-limit=400 \
- "