From 91044e10cae2399139956ebd6e54536adb68fd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Wed, 27 May 2020 18:01:28 +0200 Subject: [PATCH] [app-emulation/qemu-guest-agent] this is in tree now --- 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-4.2.0-fix-shutdown.patch | 11 --- .../qemu-guest-agent-4.2.0-sysmacros.patch | 17 ---- app-emulation/qemu-guest-agent/metadata.xml | 12 --- .../qemu-guest-agent-4.2.0-r1.ebuild | 83 ------------------- 10 files changed, 181 deletions(-) delete mode 100644 app-emulation/qemu-guest-agent/Manifest delete mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga-systemd.service delete mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga-systemd.udev delete mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga.conf-r1 delete mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga.init-r1 delete mode 100644 app-emulation/qemu-guest-agent/files/qemu-ga.logrotate delete mode 100644 app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch delete mode 100644 app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch delete mode 100644 app-emulation/qemu-guest-agent/metadata.xml delete mode 100644 app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest deleted file mode 100644 index 5cbf567..0000000 --- a/app-emulation/qemu-guest-agent/Manifest +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 51cd7b3..0000000 --- a/app-emulation/qemu-guest-agent/files/qemu-ga-systemd.service +++ /dev/null @@ -1,11 +0,0 @@ -[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 deleted file mode 100644 index 8a290ab..0000000 --- a/app-emulation/qemu-guest-agent/files/qemu-ga-systemd.udev +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index a1a78df..0000000 --- a/app-emulation/qemu-guest-agent/files/qemu-ga.conf-r1 +++ /dev/null @@ -1,11 +0,0 @@ -# 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 deleted file mode 100644 index f08c082..0000000 --- a/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1 +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100644 index ffcc477..0000000 --- a/app-emulation/qemu-guest-agent/files/qemu-ga.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/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-4.2.0-fix-shutdown.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch deleted file mode 100644 index f697816..0000000 --- a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qemu-4.2.0/qga/commands-posix.c.orig 2020-03-23 11:15:05.972610989 +0300 -+++ qemu-4.2.0/qga/commands-posix.c 2020-03-23 11:15:39.676015087 +0300 -@@ -108,7 +108,7 @@ - reopen_fd_to_null(1); - reopen_fd_to_null(2); - -- execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", -+ execle("/sbin/shutdown", "shutdown", "-h", "now", shutdown_flag, "+0", - "hypervisor initiated shutdown", (char*)NULL, environ); - _exit(EXIT_FAILURE); - } else if (pid < 0) { diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch deleted file mode 100644 index 94b6a2c..0000000 --- a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 -@@ -118,6 +118,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 deleted file mode 100644 index 88bcd95..0000000 --- a/app-emulation/qemu-guest-agent/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 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-r1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild deleted file mode 100644 index 513caae..0000000 --- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit eutils systemd toolchain-funcs 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}-4.2.0-sysmacros.patch #580924 - "${FILESDIR}"/${PN}-4.2.0-fix-shutdown.patch #681874 -) - -src_configure() { - tc-export AR LD OBJCOPY RANLIB - - 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" -}