Add separate ebuild for the QEMU guest agent so it can be used when Gentoo is a guest instead of installing the all of QEMU for just the guest.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

10 files changed, 160 insertions, 2 deletions

diff --git a/app-emulation/qemu-guest-agent/ChangeLog b/app-emulation/qemu-guest-agent/ChangeLog
new file mode 100644
index 000000000000..158b725e7b4f
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for app-emulation/qemu-guest-agent
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/ChangeLog,v 1.1 2012/07/28 22:00:05 cardoe Exp $
+
+*qemu-guest-agent-1.1.1 (28 Jul 2012)
+
+  28 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+  +qemu-guest-agent-1.1.1.ebuild, +files/qemu-ga.conf, +files/qemu-ga.init,
+  +files/qemu-ga.logrotate, +files/qemu-ga-systemd.service,
+  +files/qemu-ga-systemd.udev, +metadata.xml:
+  Add separate ebuild for the QEMU guest agent so it can be used when Gentoo is
+  a guest instead of installing the all of QEMU for just the guest.
+
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
new file mode 100644
index 000000000000..1055b473d158
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -0,0 +1,9 @@
+AUX qemu-ga-systemd.service 227 SHA256 0ceef6a004c0e3499124a09e497f8d2a3ce102301706319daa28e8e9aea617dd SHA512 73e3d531aa3de794bc851dcccc6c1f0495a7c94070bd3c1499abbc98dcd8a5017bc1a77f357ff7b81c2abfb8c0378d1b4da2f832a3e45725fab19bcd07216ad1 WHIRLPOOL 5abf158c1830123105e5e4449fe7e8bb63dc6851986451116b665227a73bdc7cc28dbeb3c3caf93210eda722c245b8dc734c43f22fb9d08b81e0e35ea742d9d6
+AUX qemu-ga-systemd.udev 129 SHA256 c57934919d7ea39c04604374d8256d4f434ecba65f8063c6fd1927ee6d709ed6 SHA512 14d47e55987d4e06712ccb7192cd03bdcdd887ce42473558fceff6eee7bafdadae953f08f8cf7facdfc4b340d4b47d75ebaae1ef5696de994cf0c224b8726edb WHIRLPOOL 84d3c1f6389b965cafc43e3c3fdfad59f9b2d68b65d7879b8659a3b0871684a8d35081c700193df2696bf5c3bddce00efa8da647a38c41c42f3182436db08536
+AUX qemu-ga.conf 311 SHA256 d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298 SHA512 d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f WHIRLPOOL 83c93123a4bd64b4ae41c30dcbece3d524bffd9eee7e26dd4045aa74a026713b10309019a7bc57237431870b9901a7cd5b24f3888718c3db74f655291eef896d
+AUX qemu-ga.init 728 SHA256 0b7cca62d2adc56769e6872d27137dbbe465166d261e64b14744ab9f698bd4f5 SHA512 1d036c7a208e7b0c9740306bd09a05d3b71321251bc80026bbec71e4440434ec8f797e28200e36d5fc1b5673db6d1c63c13170b40f03dcc488caf84f91668500 WHIRLPOOL 71a94af28c123abc7ba6be36df29c229a4278c116682e87b07d6068cf1e2ed6eabf897f18d64dbc62a12e6768faab169e8e8681eef4aba40bdecb6dc1d1a1596
+AUX qemu-ga.logrotate 128 SHA256 9332aeb8f09814fbdbdff8bfb6e6784bf8031a17cba08e8490060fb87f8f024c SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789 WHIRLPOOL 6d715ed34541254a2d69943805d29e15f11a7c0ebaa30a47e090787f26640b3d64e2d48892e66c094593cc9f9d8ff37c788542c180d8bc5b9a2573b832b18cca
+DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
+EBUILD qemu-guest-agent-1.1.1.ebuild 1600 SHA256 6c0570cd555aaefdf986b1e59a9b4de0d2572cf2857711da16d7136da49c9bca SHA512 808e3ae2e9bbdeff83601ec2667dfab115aad6e1d587210dc8af86ef51b8e6780ec384cde4c0d7bff8b2989407635e74c99e6af63757962a76058899333e077e WHIRLPOOL 7689d7737fad893cf7e741f66fc46f734747abebaf7d2f2070962d182b031f566e6ba754f678a20dfe7c16a163aed6aa5ab366a7f6186cb99fe51948d7d5c00f
+MISC ChangeLog 653 SHA256 9fd2b95dd026d8d1d3e0d3260711d38fd52a474f7770a9339d6bfdd65183a673 SHA512 781256a55b1e542a6bd2aa5c36f40812e0c98148a5a5402e677ce0cfb6e3b7f1a7f94825af3cc7a835afaffec174baf9ddcca6edced81ee0a4e47e108f25d0dc WHIRLPOOL 3fefeec87753fd67c294c0df0fc8662758da8ead8efce441d94c626255e6b438d7f3471b457fd405c5789f5c0976d60081f555cc62e1df93d2353448611375a6
+MISC metadata.xml 250 SHA256 10b9e945ef8bfa38f795b51e2914b0c4b2c8a6a315bd9cc00181714f48039ee6 SHA512 74fdba3406d2193fc37175e4e413b5debc01a68a5299b3023ec6151d3a03bc7794798a9e46b0f3bd7bc2687edf364a344bc60fdb8f20b6a46b9fe82c27975d0c WHIRLPOOL 37679ae4d3e6652a89c50e06fa70280793b555b131b28714e424354caecaec4bb6954f087b8207abd8ad318732ef55195734397b960e5342dea4ea5b4810b005
diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga-systemd.service b/app-emulation/qemu-guest-agent/files/qemu-ga-systemd.service
new file mode 100644
index 000000000000..51cd7b37ff79
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-ga-systemd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=QEMU Guest Agent
+BindTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
+After=dev-virtio\x2dports-org.qemu.guest_agent.0.device
+
+[Service]
+ExecStart=-/usr/bin/qemu-ga
+Restart=always
+RestartSec=0
+
+[Install]
diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga-systemd.udev b/app-emulation/qemu-guest-agent/files/qemu-ga-systemd.udev
new file mode 100644
index 000000000000..ce5819597877
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-ga-systemd.udev
@@ -0,0 +1,2 @@
+SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", \
+  TAG+"systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga.conf b/app-emulation/qemu-guest-agent/files/qemu-ga.conf
new file mode 100644
index 000000000000..228c0325444d
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-ga.conf
@@ -0,0 +1,7 @@
+# Specifies the transport method used to communicate to QEMU on the host side
+# Default: virtio-serial
+#GA_METHOD="virtio-serial"
+
+# Specifies the device path for the communications back to QEMU on the host
+# Default: /dev/virtio-ports/org.qemu.guest_agent.0
+#GA_PATH="/dev/virtio-ports/org.qemu.guest_agent.0"
diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga.init b/app-emulation/qemu-guest-agent/files/qemu-ga.init
new file mode 100644
index 000000000000..599673574b65
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-ga.init
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/files/qemu-ga.init,v 1.1 2012/07/28 22:00:05 cardoe Exp $
+
+depend() {
+
+}
+
+start() {
+    GA_METHOD=${GA_METHOD:-virtio-serial}
+    GA_PATH=${GA_PATH:-/dev/virtio-ports/org.qemu.guest_agent.0}
+
+    ebegin "Starting QEMU Guest Agent"
+
+    start-stop-daemon --start --pidfile /var/run/qemu-ga.pid \
+        --exec /usr/bin/qemu-ga -- -m ${GA_METHOD} -p ${GA_PATH} \
+        -l /var/log/qemu-ga.log -d
+
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping QEMU Guest Agent"
+
+    start-stop-daemon --stop --pidfile /var/run/qemu-ga.pid
+
+    eend $?
+}
diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga.logrotate b/app-emulation/qemu-guest-agent/files/qemu-ga.logrotate
new file mode 100644
index 000000000000..ffcc477d3358
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-ga.logrotate
@@ -0,0 +1,9 @@
+/var/log/qemu-ga.log {
+    weekly
+    missingok
+    rotate 4
+    compress
+    delaycompress
+    copytruncate
+    minsize 100k
+}
diff --git a/app-emulation/qemu-guest-agent/metadata.xml b/app-emulation/qemu-guest-agent/metadata.xml
new file mode 100644
index 000000000000..a33a278324be
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qemu</herd>
+	<use>
+		<flag name='systemd'>Install SystemD init script instead of OpenRC</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.1.1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.1.1.ebuild
new file mode 100644
index 000000000000..31da731f9b1d
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.1.1.ebuild,v 1.1 2012/07/28 22:00:05 cardoe Exp $
+
+EAPI=4
+
+inherit systemd
+
+MY_PN="qemu-kvm"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE="systemd"
+
+DEPEND=">=dev-libs/glib-2.22"
+RDEPEND="${DEPEND}
+	!app-emulation/qemu
+	!<app-emulation/qemu-kvm-1.1.1-r1"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	./configure
+}
+
+src_compile() {
+	emake qemu-ga
+}
+
+src_install() {
+	dobin qemu-ga
+
+	if ! use systemd; then
+		# Normal init stuff
+		newinitd "${FILESDIR}/qemu-ga.init" qemu-guest-agent
+		newconfd "${FILESDIR}/qemu-ga.conf" qemu-guest-agent
+
+		insinto /etc/logrotate.d/
+		newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+	else 
+		# systemd stuff
+		insinto /lib/udev/rules.d/
+		newins "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+		systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+			qemu-guest-agent.service
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd; then
+		elog "You should add 'qemu-guest-agent' to the default runlevel."
+		elog "e.g. rc-update add qemu-guest-agent default"
+	fi
+}
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index beef93318101..1f889fcf6d26 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -23,6 +23,6 @@ EBUILD qemu-kvm-1.0.1-r1.ebuild 12205 SHA256 2d0937b952b3ef20d9e906341abed691199
 EBUILD qemu-kvm-1.0.1.ebuild 11479 SHA256 6da24cfe70e532037576f6893e894686e9af15dd517bfcdb28e2dbc921a3832b SHA512 7b20463967947dc5398c45a5c9cdafb4a489f7acbf921c537f0b7286e07fa687f6f19e47713161c52cc43a9d4d003e706cee5aef2f0ece8bc6a768082cb15390 WHIRLPOOL 3d845dab92364b97545f996adbf7af1b64abd5e1c90c1aacd0d35dab038ea3d024ea086b14a26352f72df1dc290c750f3087a100a5405ddc7bd0f2888f1c58c6
 EBUILD qemu-kvm-1.1.0.ebuild 11791 SHA256 e83a0136e4f26a4a87738b735af0fa015ef76984a0368497bfdf2b52eede7748 SHA512 cd61e516de7db70f3d696ab38554729af5e4dcf6c5003de5441ffb30d22a1c5d72bd05478e1297bdf4d25c17a43cedba28899dda19807cae884533d1ac399ba7 WHIRLPOOL 03fb278a398c0c2b08f8b5bf93781b08b64d5b6cfc1affdfdecc506d55acd7c15072f1c34196f1a3be40bd9fdbb34607f6329fa50eb0cadf54084483b99f1db3
 EBUILD qemu-kvm-1.1.1-r1.ebuild 11610 SHA256 170a51c9b2b9c22d8bcf7196cd7521d3bb1cd69e0ff4190881202cb42b7b2721 SHA512 5c8fd1969847fbe81ccb282621600b67bd105cd3900d235c066beab08f2a6e946477800964337967d96106ab3ff94aa0a4eb6e6833f4d7ff0793b49ab6c820b2 WHIRLPOOL df51c49438b98705ea5183db97a563b9084b6aa89402d834460cb206ce21747a7abebffd17b2f3bbce448b2f232875aef17fd266f6647c6a01c223cb786cba61
-EBUILD qemu-kvm-9999.ebuild 11803 SHA256 9ae8061a59cbc5bd17373c262d7284a21c3031b5e728941f53ea652646758407 SHA512 7478cd009a1a4e66fd83d3e72eb87553c8e6a3eae56fc51e6146cffdbc0332613fa2a47c0546199358f3578120dd6335036c907219dc67adb2923ddc220c2fd4 WHIRLPOOL 3bc566644c577bf5ef113df1bea7cefe54efed4d06949432bced8ee982d9cfb70efb52fcaa3767d469471980c1c7b2fb4e89a9b79c5864bd173a7267eedff31a
-MISC ChangeLog 27840 SHA256 e778474c7ce1ac6e67a29dd8a38e713877bb2d529d3d5ffb1475d238d2fb072b SHA512 3a13f00ee05776cdf750d8a9b61298473d9585cb537e251bc1b74c18648e1c6c5a98b98989308971d48d17bc6b7a75c4d760986a43d61d551a418540093d77f8 WHIRLPOOL 0365ce6367825044053f08631c790ff33310ca3e4f34fe85531c01d48b1a76c7c207cfbd38a16281e84860ceb0e0a5b7e004ddcf883ae4739b0d343eb8b0f835
+EBUILD qemu-kvm-9999.ebuild 11804 SHA256 7c49f823251c32fc111b61ddddc072c569610aaeb59bcb575006bed61ffc2658 SHA512 e6e518cebe9c5bda1b8061e6ee258be7ddccfbb618263a5f4e92746544d9227db5791f852e9b481390f3e4dc5831653be056b2fb12d3dd7579842806ddd5fb3a WHIRLPOOL 364f264fa27ec3f921561aa1582e4c7b53bbbe066d96617a10e496e0dffa7da9ea53382741dc63479d495aafb7cb9082fd1b444439cbe5e5641c8970d717b7ab
+MISC ChangeLog 28000 SHA256 5e5b619cffe687c3f562a595f89e98391dff6dbd03c35a4eebf0d2a7f244cf66 SHA512 1403a6db21932aec3975e471cf3922dc649baceea6392f1741a5208e4a56afb779251d866e2a2053edd50c519da41771a0d8a8d90fa83de57a7af15f2a6de1c2 WHIRLPOOL c731d62a1ff4a7ec816f9490efefa22d2b8ad38c77891963d03f821a26b75f38c9fa0a7bb8eae3e6775a06e3770b7d7d89bd6d768b0998159f1395a3d96c4014
 MISC metadata.xml 2416 SHA256 1613b0e695f6cdd5c21b0b6e5f470adc250b261a8a40bfb3c7f246d3f590acf9 SHA512 e6906e146aded4f9e182fc8da99a578800b91287f5d5446c53d08ae764304c2ca02002098f61032f547873f808554cac2d4b29115ce0dcea36df41e9e6667ec8 WHIRLPOOL da9ff6660bb89b3b4077bfb52f18098eb7392ac0e1af05028950c9843c03be6f6a0765ec9577e6a0d8f36fd6b130828c52f31a0d020034531a944dca516009e3