Merge pull request #2490 from flatcar/tormath1/guest-agent-arm

arm64: add qemu-guest-agent
flatcar · Dec 3, 2024 · 8250b85 · 8250b85
2 parents ca63fef + 12634f4
commit 8250b85
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/changelog/bugfixes/2024-12-02-qemu-guest-agent.md 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))
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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Added qemu-guest-agent to ARM64 images ([flatcar/flatcar#1593](https://github.com/flatcar/Flatcar/issues/1593))