From adcc752da64208a04faa6eabca98fcd4d201dca6 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-r179.ebuild => coreos-init-0.0.1-r180.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-r179.ebuild => coreos-init-0.0.1-r180.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r179.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r180.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r179.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r180.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 ac18276432..c955c5152f 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="3e6270ca55dabaa8c00322753bf409c8453f97a4" # flatcar-3510-backport + CROS_WORKON_COMMIT="8edef94dd894beaccb1d44887cc0a68bae106a9f" # flatcar-3510-backport KEYWORDS="amd64 arm arm64 x86" fi From f4ed4ed07b16ae4208b2ed6fc6a530ea5e45f9a3 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 eb2477f6f3285fa68430cdfb83a5b61d6155f278 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 b0661c4a4f..9c1ba35462 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="681c0791696968957dfb0d6d74558b69f4ace43e" # flatcar-3510-backport + CROS_WORKON_COMMIT="af7ac28107d0a960b09e0c63ae9dd343aa697c98" # flatcar-3510-backport KEYWORDS="amd64 arm arm64 x86" fi