From 2500974584fdedc72ba9a634e43a08a9f25a98c2 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 12 Sep 2023 14:51:35 +0200 Subject: [PATCH 1/3] coreos-init: Exclude mana VF from network management The flatcar/init commits includes a change to the azure sriov config file that excludes devices managed by the mana driver from networkd management, just like mlx4 and mlx5 devices. Signed-off-by: Jeremi Piotrowski --- ...eos-init-0.0.1-r180.ebuild => coreos-init-0.0.1-r181.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r180.ebuild => coreos-init-0.0.1-r181.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r180.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r181.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r180.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r181.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index ec21b7c4664..2a39fb928d2 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="5b3ef3ad0febec168137670b9243e8d220c90c7e" # flatcar-3602-backport + CROS_WORKON_COMMIT="5b0c6050c8f3e0daf940ca7000d5924a8f73052d" # flatcar-3602-backport KEYWORDS="amd64 arm arm64 x86" fi From 08a084330bb31d6010a7b098ef0efcdb7a5b21bc Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 12 Sep 2023 14:59:33 +0200 Subject: [PATCH 2/3] changelog: Add entry for mana vf support Signed-off-by: Jeremi Piotrowski --- changelog/changes/2023-09-12-azure-mana-vf.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2023-09-12-azure-mana-vf.md diff --git a/changelog/changes/2023-09-12-azure-mana-vf.md b/changelog/changes/2023-09-12-azure-mana-vf.md new file mode 100644 index 00000000000..9a3ec7aa1d8 --- /dev/null +++ b/changelog/changes/2023-09-12-azure-mana-vf.md @@ -0,0 +1 @@ +- Add support for Microsoft Azure Network Adapter (MANA) NICs on Azure ([scripts#1131](https://github.com/flatcar/scripts/pull/1131)) From dc18330cbc33202e07899a521563894935c7336f Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 15 Sep 2023 11:28:57 +0200 Subject: [PATCH 3/3] bootengine: Exclude mana VF from network management The flatcar/bootengine commit includes a change to the azure sriov config file that excludes devices managed by the mana driver from networkd management, just like mlx4 and mlx5 devices. Signed-off-by: Jeremi Piotrowski --- ...ootengine-0.0.38-r13.ebuild => bootengine-0.0.38-r14.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r13.ebuild => bootengine-0.0.38-r14.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r14.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r13.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r14.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 86785130fdc..6d670a544db 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="a4ea304bcca3b00defba5011c26053716017eff4" # flatcar-3602-backport + CROS_WORKON_COMMIT="9e68a0cd0bbc92c68169ea544b6c5a720cb78e20" # flatcar-3602-backport KEYWORDS="amd64 arm arm64 x86" fi