From 47ba9fb9bcbb57fbdfbd9bd9c9ef7349da50c0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Fri, 20 Dec 2019 21:22:42 +0100 Subject: [PATCH] [app-emulation/qemu-guest-agent] version bump to 4.2 --- app-emulation/qemu-guest-agent/Manifest | 1 + .../files/qemu-ga-systemd.service | 11 +++ .../files/qemu-ga-systemd.udev | 2 + .../qemu-guest-agent/files/qemu-ga.conf-r1 | 11 +++ .../qemu-guest-agent/files/qemu-ga.init-r1 | 24 ++++++ .../qemu-guest-agent/files/qemu-ga.logrotate | 9 ++ .../qemu-guest-agent-2.5.0-sysmacros.patch | 17 ++++ app-emulation/qemu-guest-agent/metadata.xml | 12 +++ .../qemu-guest-agent-4.2.0.ebuild | 82 +++++++++++++++++++ 9 files changed, 169 insertions(+) create mode 100644 app-emulation/qemu-guest-agent/Manifest create mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga-systemd.service create mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga-systemd.udev create mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga.conf-r1 create mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga.init-r1 create mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga.logrotate create mode 100644 app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch create mode 100644 app-emulation/qemu-guest-agent/metadata.xml create mode 100644 app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest new file mode 100644 index 0000000..5cbf567 --- /dev/null +++ b/app-emulation/qemu-guest-agent/Manifest @@ -0,0 +1 @@ +DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56 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 0000000..51cd7b3 --- /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 0000000..8a290ab --- /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-r1 b/app-emulation/qemu-guest-agent/files/qemu-ga.conf-r1 new file mode 100644 index 0000000..a1a78df --- /dev/null +++ b/app-emulation/qemu-guest-agent/files/qemu-ga.conf-r1 @@ -0,0 +1,11 @@ +# 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" + +# Additional options to qemu-guest-agent such as --fsfreeze-hook +# See qemu-ga --help for more info +#GA_OPTIONS="-F/etc/qemu/fsfreeze-hook" diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1 b/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1 new file mode 100644 index 0000000..f08c082 --- /dev/null +++ b/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1 @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 /run/qemu-ga.pid \ + --exec /usr/bin/qemu-ga -- -m ${GA_METHOD} -p ${GA_PATH} \ + -l /var/log/qemu-ga.log -d -f /run/qemu-ga.pid -t /run ${GA_OPTIONS} + + eend $? +} + +stop() { + ebegin "Stopping QEMU Guest Agent" + + start-stop-daemon --stop --pidfile /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 0000000..ffcc477 --- /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/files/qemu-guest-agent-2.5.0-sysmacros.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch new file mode 100644 index 0000000..4d5690c --- /dev/null +++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/580924 + +Linux C libs are moving away from implicit header pollution with sys/types.h + +--- a/include/qemu/osdep.h ++++ b/include/qemu/osdep.h +@@ -78,6 +78,10 @@ extern int daemon(int, int); + #include + #include + ++#ifdef __linux__ ++#include ++#endif ++ + #ifdef __OpenBSD__ + #include + #endif diff --git a/app-emulation/qemu-guest-agent/metadata.xml b/app-emulation/qemu-guest-agent/metadata.xml new file mode 100644 index 0000000..88bcd95 --- /dev/null +++ b/app-emulation/qemu-guest-agent/metadata.xml @@ -0,0 +1,12 @@ + + + + + tamiko@gentoo.org + Matthias Maier + + + virtualization@gentoo.org + Gentoo Virtualization Project + + diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild new file mode 100644 index 0000000..59727da --- /dev/null +++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) + +inherit eutils systemd udev python-any-r1 + +MY_PN="qemu" +MY_P="${MY_PN}-${PV}" + +SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM" +HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent" + +LICENSE="GPL-2 BSD-2" +SLOT="0" +IUSE="" + +RDEPEND="dev-libs/glib" + +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924 +) + +src_configure() { + tc-export AR LD OBJCOPY + + local myconf=( + --prefix=/usr + --sysconfdir=/etc + --libdir="/usr/$(get_libdir)" + --localstatedir=/ + --disable-bsd-user + --disable-linux-user + --disable-system + --disable-strip + --disable-tools + --disable-werror + --enable-guest-agent + --python="${PYTHON}" + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + ) + echo "./configure ${myconf[*]}" + ./configure "${myconf[@]}" || die +} + +src_compile() { + emake V=1 qemu-ga +} + +src_install() { + dobin qemu-ga + + # Normal init stuff + newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent + newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent + + insinto /etc/logrotate.d + newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent + + # systemd stuff + udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules + + systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \ + qemu-guest-agent.service +} + +pkg_postinst() { + elog "You should add 'qemu-guest-agent' to the default runlevel." + elog "e.g. rc-update add qemu-guest-agent default" +}