diff options
Diffstat (limited to 'meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb')
| -rw-r--r-- | meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 607f1b789c..217a932f06 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -5,16 +5,17 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd +GBMC_NCSI_DHCP_RELAY ??= "${@'' if int(d.getVar('FLASH_SIZE')) < 65536 else '1'}" GBMC_NCSI_IF_OLD ??= "" GBMC_NCSI_PURGE_ETC ??= "" SRC_URI += " \ - file://-bmc-gbmcbrncsidhcp.netdev \ - file://-bmc-gbmcbrncsidhcp.network \ - file://-bmc-gbmcncsidhcp.netdev \ - file://-bmc-gbmcncsidhcp.network \ + ${@'' 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'} \ file://50-gbmc-ncsi.rules.in \ - file://gbmc-ncsi-dhcrelay.service.in \ + ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://gbmc-ncsi-dhcrelay.service.in'} \ file://gbmc-ncsi-ip-from-ra.service.in \ file://gbmc-ncsi-ip-from-ra.sh.in \ file://gbmc-ncsi-smartnic-wa.sh.in \ @@ -34,7 +35,7 @@ S = "${WORKDIR}" RDEPENDS:${PN} += " \ bash \ - dhcp-relay \ + ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'dhcp-relay'} \ gbmc-ip-monitor \ ncsid \ network-sh \ @@ -50,7 +51,7 @@ FILES:${PN} += " \ " SYSTEMD_SERVICE:${PN} += " \ - gbmc-ncsi-dhcrelay.service \ + ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'gbmc-ncsi-dhcrelay.service'} \ gbmc-ncsi-sslh.service \ gbmc-ncsi-sslh.socket \ gbmc-ncsi-set-nicenabled.service \ @@ -72,15 +73,17 @@ do_install:append() { echo "net.ipv6.conf.$if_name.dad_transmits=0" \ >>${D}${sysconfdir}/sysctl.d/25-gbmc-ncsi.conf - install -d -m0755 ${D}${systemd_unitdir}/network - install -m0644 ${WORKDIR}/-bmc-gbmcbrncsidhcp.netdev \ - ${D}${systemd_unitdir}/network/ - install -m0644 ${WORKDIR}/-bmc-gbmcbrncsidhcp.network \ - ${D}${systemd_unitdir}/network/ - install -m0644 ${WORKDIR}/-bmc-gbmcncsidhcp.netdev \ - ${D}${systemd_unitdir}/network/ - install -m0644 ${WORKDIR}/-bmc-gbmcncsidhcp.network \ - ${D}${systemd_unitdir}/network/ + if [ "${GBMC_NCSI_DHCP_RELAY}" = 1 ]; then + install -d -m0755 ${D}${systemd_unitdir}/network + install -m0644 ${WORKDIR}/-bmc-gbmcbrncsidhcp.netdev \ + ${D}${systemd_unitdir}/network/ + install -m0644 ${WORKDIR}/-bmc-gbmcbrncsidhcp.network \ + ${D}${systemd_unitdir}/network/ + install -m0644 ${WORKDIR}/-bmc-gbmcncsidhcp.netdev \ + ${D}${systemd_unitdir}/network/ + install -m0644 ${WORKDIR}/-bmc-gbmcncsidhcp.network \ + ${D}${systemd_unitdir}/network/ + fi netdir=${D}${systemd_unitdir}/network/00-bmc-$if_name.network.d install -d -m0755 "$netdir" @@ -132,8 +135,10 @@ do_install:append() { sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-set-nicenabled.service.in \ >${D}${systemd_system_unitdir}/gbmc-ncsi-set-nicenabled.service - sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-dhcrelay.service.in \ - >${D}${systemd_system_unitdir}/gbmc-ncsi-dhcrelay.service + if [ "${GBMC_NCSI_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 if [ -n "${GBMC_NCSI_IF_OLD}" ]; then sed -e "s,@NCSI_IF@,$if_name,g" -e "s,@OLD_IF@,${GBMC_NCSI_IF_OLD},g" ${WORKDIR}/gbmc-ncsi-old.service.in \ @@ -153,8 +158,8 @@ do_install:append() { install -d -m0755 ${D}${libexecdir} install -m0755 ${WORKDIR}/gbmc-ncsi-ip-from-ra.sh ${D}${libexecdir}/ - sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-smartnic-wa.sh.in \ - >${WORKDIR}/gbmc-ncsi-smartnic-wa.sh + sed -e "s,@NCSI_IF@,$if_name,g" -e "s,@GBMC_NCSI_DHCP_RELAY@,${GBMC_NCSI_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}/ } |