meta-gbmc-staging: revert to gbmc-release-24.1.20
Command used:
git fetch
git checkout gbmc-release-24.1.x
git checkout -f gbmc-release-24.1.20 -- .
git commit
Tested: the following is empty
git diff HEAD gbmc-release-24.1.20
Google-Bug-Id: 329726445
Change-Id: I91d1216e51444f10d8a89e42e1183453d99e99ae
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
diff --git a/recipes-phosphor/interfaces/bmcweb_%.bbappend b/recipes-phosphor/interfaces/bmcweb_%.bbappend
index ce01af7..10783d7 100644
--- a/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -13,7 +13,6 @@
-Dhealth-populate=disabled \
-Dredfish-bmc-journal=disabled \
"
-
EXTRA_OEMESON:append:gbmc:gbmcfork = " \
-Dgoogle-baremetal=disabled \
"
@@ -157,15 +156,10 @@
}
# gRPC-Redfish feature starts
-# Insecure grpc is needed for the Redfish migration project
-# before nodes get credentials.
-# Note, any insecure port is still blacklist by the nftable.
-# See b/315215456, b/303452037
grpc_redfish_options = " \
-Dmtls-grpc=enabled \
-Dmtls-grpc-port=443 \
- -Dinsecure-grpc=enabled \
- -Dinsecure-grpc-port=3995 \
+ -Dredfish-oem-google-grpc-statistics=enabled \
"
grpc_redfish_depends = " \
grpc-redfish \
diff --git a/recipes-phosphor/interfaces/gbmcweb.inc b/recipes-phosphor/interfaces/gbmcweb.inc
index 3c65f18..29382cf 100644
--- a/recipes-phosphor/interfaces/gbmcweb.inc
+++ b/recipes-phosphor/interfaces/gbmcweb.inc
@@ -1,2 +1,2 @@
GBMCWEB_SRC_URI = "git://gbmc.googlesource.com/gbmcweb;branch=gbmc-release-24.1.x;protocol=https"
-GBMCWEB_SRCREV = "d09b70cc82d5d8716387f396a66be35775f58e78"
+GBMCWEB_SRCREV = "d3034e782dcfb879d4081953e5f8ead3cc744236"
