commit ac01f53403228b91f299b94ce29ab42cdc4ccd1b
author William A. Kennington III <wak@google.com> Thu Sep 05 02:08:09 2024 -0700
committer William A. Kennington III <wak@google.com> Fri Sep 13 04:34:03 2024 +0000
tree d4c7fbc4caa172d4559a78bb36f887cb06f654d8
parent dc3b3cf6d0d99b3e03a91682bda37c8fd42d796f

meta-google: gbmc-ncsi-config: Rename GBMC_DHCP_RELAY

DHCP_RELAY is not specific to NCSI (although it was always used only on
NCSI in the past). We are planning to use an alternative out of band
scheme that still needs relays, make the setting name generic.

Change-Id: Iefbc6e37380bffd33bdd77c0f952611787345755
Signed-off-by: William A. Kennington III <wak@google.com>

meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in

diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in
index 88f52d3..9aa9b42 100644
--- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in
+++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-HAS_DHCRELAY='@GBMC_NCSI_DHCP_RELAY@'
+HAS_DHCRELAY='@GBMC_DHCP_RELAY@'
 
 if [ "$HAS_DHCRELAY" = 1 ]; then
   override=/run/systemd/system/gbmc-ncsi-dhcrelay.service.d/10-nosp.conf

meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb

diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
index 7bf73a0..aac9935 100644
--- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
+++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
@@ -5,18 +5,18 @@
 
 inherit systemd
 
-GBMC_NCSI_DHCP_RELAY ??= "${@'' if int(d.getVar('FLASH_SIZE')) < 65536 else '1'}"
+GBMC_DHCP_RELAY ??= "${@'' if int(d.getVar('FLASH_SIZE')) < 65536 else '1'}"
 GBMC_NCSI_IF_OLD ??= ""
 GBMC_NCSI_PURGE_ETC ??= ""
 GBMC_NCSI_DHCP_IMPERSONATE_HOST ??= "1"
 
 SRC_URI += " \
-  ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrncsidhcp.netdev'} \
-  ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrncsidhcp.network'} \
-  ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://-bmc-gbmcncsidhcp.netdev'} \
-  ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://-bmc-gbmcncsidhcp.network'} \
+  ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrncsidhcp.netdev'} \
+  ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrncsidhcp.network'} \
+  ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcncsidhcp.netdev'} \
+  ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcncsidhcp.network'} \
   file://50-gbmc-ncsi.rules.in \
-  ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://gbmc-ncsi-dhcrelay.service.in'} \
+  ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://gbmc-ncsi-dhcrelay.service.in'} \
   file://gbmc-ncsi-ra.service.in \
   file://gbmc-ncsi-ra.sh \
   file://gbmc-ncsi-smartnic-wa.sh.in \
@@ -36,7 +36,7 @@
 
 RDEPENDS:${PN} += " \
   bash \
-  ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'dhcp-relay'} \
+  ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'dhcp-relay'} \
   gbmc-ip-monitor \
   gbmc-net-common \
   ncsid \
@@ -52,7 +52,7 @@
   "
 
 SYSTEMD_SERVICE:${PN} += " \
-  ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'gbmc-ncsi-dhcrelay.service'} \
+  ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'gbmc-ncsi-dhcrelay.service'} \
   gbmc-ncsi-sslh.service \
   gbmc-ncsi-sslh.socket \
   gbmc-ncsi-set-nicenabled.service \
@@ -74,7 +74,7 @@
   echo "net.ipv6.conf.$if_name.dad_transmits=0" \
     >>${D}${sysconfdir}/sysctl.d/25-gbmc-ncsi.conf
 
-  if [ "${GBMC_NCSI_DHCP_RELAY}" = 1 ]; then
+  if [ "${GBMC_DHCP_RELAY}" = 1 ]; then
     install -d -m0755 ${D}${systemd_unitdir}/network
     install -m0644 ${WORKDIR}/-bmc-gbmcbrncsidhcp.netdev \
       ${D}${systemd_unitdir}/network/
@@ -136,7 +136,7 @@
   sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-set-nicenabled.service.in \
     >${D}${systemd_system_unitdir}/gbmc-ncsi-set-nicenabled.service
 
-  if [ "${GBMC_NCSI_DHCP_RELAY}" = "1" ]; then
+  if [ "${GBMC_DHCP_RELAY}" = "1" ]; then
     sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-dhcrelay.service.in \
       >${D}${systemd_system_unitdir}/gbmc-ncsi-dhcrelay.service
   fi
@@ -157,7 +157,7 @@
   install -d -m0755 ${D}${libexecdir}
   install -m0755 ${WORKDIR}/gbmc-ncsi-ra.sh ${D}${libexecdir}/
 
-  sed -e "s,@NCSI_IF@,$if_name,g" -e "s,@GBMC_NCSI_DHCP_RELAY@,${GBMC_NCSI_DHCP_RELAY},g" \
+  sed -e "s,@NCSI_IF@,$if_name,g" -e "s,@GBMC_DHCP_RELAY@,${GBMC_DHCP_RELAY},g" \
     ${WORKDIR}/gbmc-ncsi-smartnic-wa.sh.in >${WORKDIR}/gbmc-ncsi-smartnic-wa.sh
   install -d -m0755 ${D}${bindir}
   install -m0755 ${WORKDIR}/gbmc-ncsi-smartnic-wa.sh ${D}${bindir}/