Revert "meta-gbmc-staging: revert to gbmc-release-24.1.20"
Set the release branch back to the current version
This reverts commit 99e9d7f31b9da07044c5c67bb5b1b3c1d9aeea98.
Tested: the following is empty:
git diff HEAD gbmc-release-24.1.28
Google-Bug-Id: 329726445
Fusion-Link: fusion2 N/A
Change-Id: I47643836a618875ce71289d8b22255a134e412f1
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
diff --git a/recipes-phosphor/interfaces/bmcweb_%.bbappend b/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 10783d7..ce01af7 100644
--- a/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -13,6 +13,7 @@
-Dhealth-populate=disabled \
-Dredfish-bmc-journal=disabled \
"
+
EXTRA_OEMESON:append:gbmc:gbmcfork = " \
-Dgoogle-baremetal=disabled \
"
@@ -156,10 +157,15 @@
}
# 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 \
- -Dredfish-oem-google-grpc-statistics=enabled \
+ -Dinsecure-grpc=enabled \
+ -Dinsecure-grpc-port=3995 \
"
grpc_redfish_depends = " \
grpc-redfish \
diff --git a/recipes-phosphor/interfaces/gbmcweb.inc b/recipes-phosphor/interfaces/gbmcweb.inc
index 29382cf..3c65f18 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 = "d3034e782dcfb879d4081953e5f8ead3cc744236"
+GBMCWEB_SRCREV = "d09b70cc82d5d8716387f396a66be35775f58e78"
