From 1e51d3905155332352b6b01f8f59eed64daab9fd Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 2 Dec 2024 09:51:47 +0100 Subject: [PATCH 1/2] coreos/base: enable qemu-guest-agent on ARM64 Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- .../profiles/coreos/base/package.accept_keywords | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index bfe8b96ed1d..4d6a180e869 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -105,6 +105,7 @@ RDEPEND="${RDEPEND} app-crypt/go-tspi app-crypt/tpmpolicy app-editors/vim + app-emulation/qemu-guest-agent app-containers/cri-tools app-misc/ca-certificates app-misc/jq @@ -211,7 +212,6 @@ RDEPEND="${RDEPEND} # OEM specific bits that need to go in USR RDEPEND+=" amd64? ( - app-emulation/qemu-guest-agent sys-auth/google-oslogin ) " diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 8b3d91fe603..32ed10bb7e3 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -62,6 +62,9 @@ # Needed by arm64-native SDK. =app-emulation/open-vmdk-1.0 * +# Keep versions on both arches in sync. +=app-emulation/qemu-guest-agent-8.2.0 ~arm64 + # Keep versions on both arches in sync. =dev-build/meson-1.5.2 ~arm64 =dev-cpp/abseil-cpp-20230125.3-r4 ~arm64 From 12634f49e8b4b8857a650080c033ac7df5ff2ae1 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 2 Dec 2024 09:53:34 +0100 Subject: [PATCH 2/2] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/bugfixes/2024-12-02-qemu-guest-agent.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/bugfixes/2024-12-02-qemu-guest-agent.md diff --git a/changelog/bugfixes/2024-12-02-qemu-guest-agent.md b/changelog/bugfixes/2024-12-02-qemu-guest-agent.md new file mode 100644 index 00000000000..56250617cd3 --- /dev/null +++ b/changelog/bugfixes/2024-12-02-qemu-guest-agent.md @@ -0,0 +1 @@ +- Added qemu-guest-agent to ARM64 images ([flatcar/flatcar#1593](https://github.com/flatcar/Flatcar/issues/1593))