From 735fffc09ba73c98d7f3ee14424cc0d67a07f1e8 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-r173.ebuild => coreos-init-0.0.1-r174.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-r173.ebuild => coreos-init-0.0.1-r174.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r173.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r174.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r173.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r174.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 8e9edd44dd..ae12501610 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="80e4a9fa63fc1dc21cb2c76dd63842de93a6f031" # flatcar-3033-backport + CROS_WORKON_COMMIT="0566d05c8525a180a69c33c2e30f9efa8536c4b5" # flatcar-3033-backport KEYWORDS="amd64 arm arm64 x86" fi From 9e2ce07fdbc2229bb09eb70c8f2ad7db7e0bf842 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 0000000000..9a3ec7aa1d --- /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 875b3781fcd8d00f0900e4eee03ebbe53fe7bb4d 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-r11.ebuild => bootengine-0.0.38-r12.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-r11.ebuild => bootengine-0.0.38-r12.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r12.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r11.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r12.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 c3e282b700..f3f24bcf5b 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="184ab1234f8e1fa3366d1ca7f2caec7d9043f098" # tip of backports-flatcar-3033 + CROS_WORKON_COMMIT="a4a383a7b81975d62c5502aeaf8c41c202093c73" # tip of backports-flatcar-3033 KEYWORDS="amd64 arm arm64 x86" fi