diff options
14 files changed, 208 insertions, 9 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 8a59d06ea3..3e1185a147 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-6.6" -LINUX_VERSION ?= "6.6.102" +LINUX_VERSION ?= "6.6.103" -SRCREV = "abf8642d81c7073093d85f0b377ba58c41bdd71c" +SRCREV = "5a77934eb51ad4db548ca850f639429e5aa56c2f" require linux-aspeed.inc diff --git a/meta-facebook/meta-ventura/recipes-phosphor/sensors/dbus-sensors/cable-config.json b/meta-facebook/meta-ventura/recipes-phosphor/sensors/dbus-sensors/cable-config.json new file mode 100644 index 0000000000..e9b8aefa67 --- /dev/null +++ b/meta-facebook/meta-ventura/recipes-phosphor/sensors/dbus-sensors/cable-config.json @@ -0,0 +1,36 @@ +{ + "ConnectedCables": [ + "RackDripPanPort", + "RackFloorLeakPort1", + "RackFloorLeakPort2", + "RackRightManifoldPort", + "RackLeftManifoldPort", + "LeakPort1", + "LeakPort2", + "LeakPort3", + "LeakPort4", + "LeakPort5", + "LeakPort6", + "LeakPort7", + "LeakPort8", + "LeakPort9", + "LeakPort10", + "LeakPort11", + "LeakPort12", + "LeakPort13", + "LeakPort14", + "LeakPort15", + "LeakPort16", + "LeakPort17", + "LeakPort18", + "LeakPort19", + "LeakPort20", + "LeakPort21", + "LeakPort22", + "LeakPort23", + "LeakPort24", + "LeakPort25", + "LeakPort26", + "LeakPort27" + ] +} diff --git a/meta-facebook/meta-ventura/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-ventura/recipes-phosphor/sensors/dbus-sensors_%.bbappend index b19a73c998..95218b1f52 100644 --- a/meta-facebook/meta-ventura/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-facebook/meta-ventura/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -19,6 +19,7 @@ SRC_URI += "file://critical-leak-handler \ file://${WARNING_LEAK_SERVICE} \ file://${WARNING_DEASSERT_SERVICE} \ " +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'cablemonitor', ' file://cable-config.json', '', d)}" RDEPENDS:${PN}:append: = " bash" @@ -32,6 +33,11 @@ SYSTEMD_SERVICE:${PN} += "${WARNING_DEASSERT_SERVICE}" SYSTEMD_AUTO_ENABLE = "enable" do_install:append:() { + if ${@bb.utils.contains('PACKAGECONFIG', 'cablemonitor', 'true', 'false', d)}; then + install -d ${D}/var/lib/cablemonitor + install -m 0755 ${UNPACKDIR}/cable-config.json ${D}/var/lib/cablemonitor/cable-config.json + fi + install -m 0755 ${UNPACKDIR}/critical-leak-handler ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/deassert-leak-handler ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/warning-leak-handler ${D}${libexecdir}/${PN}/ diff --git a/meta-facebook/meta-ventura/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-ventura/recipes-phosphor/state/phosphor-state-manager_%.bbappend index d0ea8fb391..8588ae37b1 100644 --- a/meta-facebook/meta-ventura/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-facebook/meta-ventura/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -10,6 +10,13 @@ CHASSIS_DEFAULT_TARGETS:remove = " \ RDEPENDS:${PN}:append = " bash" +RRECOMMENDS:${PN}-chassis:remove = " ${PN}-chassis-poweron-log" + +SYSTEMD_SERVICE:${PN}-chassis:remove = "phosphor-reset-chassis-on@.service" +SYSTEMD_SERVICE:${PN}-chassis:remove = "phosphor-reset-chassis-running@.service" +SYSTEMD_SERVICE:${PN}-chassis:remove = "obmc-power-start@.service" +SYSTEMD_SERVICE:${PN}-chassis:remove = "obmc-power-stop@.service" + SRC_URI:append = " \ file://chassis-powercycle \ file://chassis-powercycle@.service \ diff --git a/meta-facebook/recipes-phosphor/network/phosphor-network/01-bmc-eth.network b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-compute/01-bmc-eth.network index ed262c6f63..ed262c6f63 100644 --- a/meta-facebook/recipes-phosphor/network/phosphor-network/01-bmc-eth.network +++ b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-compute/01-bmc-eth.network diff --git a/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/10-eth0.network b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/10-eth0.network new file mode 100644 index 0000000000..cdf5220a27 --- /dev/null +++ b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/10-eth0.network @@ -0,0 +1,39 @@ +# Copyright 2014-present Facebook. All Rights Reserved. +# +# This program file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program in a file named COPYING; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301 USA +# +[Match] +Name=eth0 + +[Network] +IPv6AcceptRA=yes +DHCP=ipv6 +VLAN=eth0.4088 + +[DHCP] +UseDomains=yes +UseNTP=yes +# We've been seeing units not able to renew the lease after it expires +# Set CriticalConnection=yes so we maintain the ip address even after +# expiration. This might be a bug with systemd v234 +# XXX Try removing this after systemd gets updated >=234 +CriticalConnection=yes +VendorClassIdentifier=OpenBMC:VENDOR_SERIAL_HERE + +[DHCPv6] +UseDomains=yes +UseNTP=yes +SendVendorOption=40981:1:string:OpenBMC:VENDOR_SERIAL_HERE diff --git a/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/20-eth0.4088.netdev b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/20-eth0.4088.netdev new file mode 100644 index 0000000000..45438762e6 --- /dev/null +++ b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/20-eth0.4088.netdev @@ -0,0 +1,24 @@ +# Copyright 2014-present Facebook. All Rights Reserved. +# +# This program file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program in a file named COPYING; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301 USA +# + +[NetDev] +Name=eth0.4088 +Kind=vlan + +[VLAN] +Id=4088 diff --git a/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/20-eth0.4088.network b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/20-eth0.4088.network new file mode 100644 index 0000000000..36fc8b82cd --- /dev/null +++ b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/20-eth0.4088.network @@ -0,0 +1,25 @@ +# Copyright 2014-present Facebook. All Rights Reserved. +# +# This program file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program in a file named COPYING; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301 USA +# + +[Match] +Name=eth0.4088 + +[Network] +IPv6AcceptRA=no +DHCP=no +Address=fe80::1/64 diff --git a/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/30-usb0.network b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/30-usb0.network new file mode 100644 index 0000000000..9530a87253 --- /dev/null +++ b/meta-facebook/recipes-phosphor/network/phosphor-network/fb-fboss/30-usb0.network @@ -0,0 +1,24 @@ +# Copyright 2014-present Facebook. All Rights Reserved. +# +# This program file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program in a file named COPYING; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301 USA +# + +[Match] +Name=usb0 + +[Network] +DHCP=no +Address=fe80::1/64 diff --git a/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend index 7b121679bf..1f5809bec3 100644 --- a/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,12 +1,36 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append = " \ +SRC_URI:append:fb-compute = " \ file://01-bmc-eth.network \ " -FILES:${PN}:append = " ${systemd_unitdir}/network/01-bmc-eth.network" +SRC_URI:append:fb-fboss = " \ + file://10-eth0.network \ + file://20-eth0.4088.network \ + file://20-eth0.4088.netdev \ + file://30-usb0.network \ +" -do_install:append() { +do_install:append:fb-compute() { install -d ${D}${systemd_unitdir}/network/ install -m 0644 ${UNPACKDIR}/01-bmc-eth.network ${D}${systemd_unitdir}/network/01-bmc-eth.network } + +do_install:append:fb-fboss() { + install -d ${D}${systemd_unitdir}/network + install -d ${D}${sysconfdir}/systemd/network + + install -m 0644 ${UNPACKDIR}/10-eth0.network ${D}${sysconfdir}/systemd/network + install -m 0644 ${UNPACKDIR}/20-eth0.4088.network ${D}${systemd_unitdir}/network/ + install -m 0644 ${UNPACKDIR}/20-eth0.4088.netdev ${D}${systemd_unitdir}/network/ + install -m 0644 ${UNPACKDIR}/30-usb0.network ${D}${systemd_unitdir}/network/ +} + +FILES:${PN}:append:fb-compute = " ${systemd_unitdir}/network/01-bmc-eth.network" + +FILES:${PN}:append:fb-fboss = " \ + ${sysconfdir}/systemd/network/10-eth0.network \ + ${systemd_unitdir}/network/20-eth0.4088.network \ + ${systemd_unitdir}/network/20-eth0.4088.netdev \ + ${systemd_unitdir}/network/30-usb0.network \ +" diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 9e23bc94e9..7bd6ed9473 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -134,8 +134,8 @@ do_install:append() { >${D}${systemd_system_unitdir}/gbmc-ncsi-networkd-wait.target if [ "${GBMC_DHCP_RELAY}" = "1" ]; then - install -d -m0755 ${D}${systemd_system_unitdir}/gbmc-br-dhcrelay@"$NCSI_IF".service.d - install -m0644 ${UNPACKDIR}/10-ncsi-dhcrelay.conf ${D}${systemd_system_unitdir}/gbmc-br-dhcrelay@"$NCSI_IF".service.d/ + install -d -m0755 ${D}${systemd_system_unitdir}/gbmc-br-dhcrelay@"$if_name".service.d + install -m0644 ${UNPACKDIR}/10-ncsi-dhcrelay.conf ${D}${systemd_system_unitdir}/gbmc-br-dhcrelay@"$if_name".service.d/ sed "s,@NCSI_IF@,$if_name,g" ${UNPACKDIR}/gbmc-ncsi-dhcrelay.sh.in \ >${UNPACKDIR}/gbmc-ncsi-dhcrelay.sh install -m0644 ${UNPACKDIR}/gbmc-ncsi-dhcrelay.sh $mondir/ diff --git a/meta-google/recipes-google/networking/files/gbmc-mac-config.sh.in b/meta-google/recipes-google/networking/files/gbmc-mac-config.sh.in index aaa9920c7c..3b31595c3b 100644 --- a/meta-google/recipes-google/networking/files/gbmc-mac-config.sh.in +++ b/meta-google/recipes-google/networking/files/gbmc-mac-config.sh.in @@ -15,6 +15,7 @@ # shellcheck source=meta-google/recipes-google/ipmi/ipmi-fru-sh/lib.sh source /usr/share/ipmi-fru/lib.sh || exit +source /usr/share/network/lib.sh || exit ipmi_fru_alloc '@EEPROM@' eeprom || exit @@ -76,6 +77,18 @@ for (( i=0; i<num; i++ )); do for override in /run/systemd/network/{00,}-bmc-$intf.network.d; do mkdir -p "$override" printf '[Link]\nMACAddress=%s\n' "$macstr" >"$override"/50-mac.conf + # Add ula for standard l2br + if [[ "$intf" == "l2br" ]]; then + eui64=$(mac_to_eui64 "$macstr") + eui64="${eui64:2}" + printf '[Address]\nAddress=fdb5:0481:10ce:1:%s/64\nPreferredLifetime=0\n' "$eui64" > "$override"/60-ula.conf + fi + # Add ula for gbmcbr + if [[ "$intf" == "gbmcbr" ]]; then + eui64=$(mac_to_eui64 "$macstr") + eui64="${eui64:2}" + printf '[Address]\nAddress=fdb5:0481:10ce:0:%s/64\nPreferredLifetime=0\n' "$eui64" > "$override"/60-ula.conf + fi done for override in /run/systemd/network/{00,}-bmc-$intf.netdev.d; do mkdir -p "$override" diff --git a/meta-google/recipes-google/networking/gbmc-mac-config.bb b/meta-google/recipes-google/networking/gbmc-mac-config.bb index 96043f1170..f26512afe5 100644 --- a/meta-google/recipes-google/networking/gbmc-mac-config.bb +++ b/meta-google/recipes-google/networking/gbmc-mac-config.bb @@ -16,6 +16,7 @@ UNPACKDIR = "${S}" RDEPENDS:${PN} += " \ bash \ ipmi-fru-sh \ + network-sh \ " FILES:${PN} += "${systemd_unitdir}" diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb index 87fe116baf..501a0c8484 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-6.6" -LINUX_VERSION ?= "6.6.102" +LINUX_VERSION ?= "6.6.103" -SRCREV = "abf8642d81c7073093d85f0b377ba58c41bdd71c" +SRCREV = "5a77934eb51ad4db548ca850f639429e5aa56c2f" require linux-nuvoton.inc |