diff options
Diffstat (limited to 'app-emulation/qemu-guest-agent')
| -rw-r--r-- | app-emulation/qemu-guest-agent/Manifest | 10 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch | 11 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch | 17 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild | 83 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild | 4 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild (renamed from app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild) | 34 |
6 files changed, 16 insertions, 143 deletions
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest index 08ccee9bf464..01164ab878f3 100644 --- a/app-emulation/qemu-guest-agent/Manifest +++ b/app-emulation/qemu-guest-agent/Manifest @@ -3,12 +3,8 @@ AUX qemu-ga-systemd.udev 130 BLAKE2B 3bd450476eb4e7b31e3c21a231b83219def32481110 AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a6138bf23aaf9a7b36604a651107236f9cb08fb44b3a055b5bc01b34243dadd6dc6dde8c0478bdaa38f SHA512 c339ddad3e94e1cd009d9f6819b7fbaddda0c8d5ad7736704cdf8efd0f802df9b905c3529ecd2a1e5831bc8e9e6e7be94ac816097f97c92deb6a3816328dba39 AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789 -AUX qemu-guest-agent-4.2.0-fix-shutdown.patch 515 BLAKE2B b70f9f67464b91042ced22a2e3e9712c62d51d5f7bb2a6e1579f44efbf877a0e4accf1b6af0e7f87cedc05bc3059ff5318524f9d00e7c513147b4d24348d6724 SHA512 d286c115f7be53f5de35068c6f2925323dde7f034f32c9e993929111591068236e21c9d85b1e9b727077f38a773b978b71a6a851dd1ff8f3b4a9d32b9b9f333a -AUX qemu-guest-agent-4.2.0-sysmacros.patch 367 BLAKE2B c52061d00b354917f701dadd37218f8e61d5a2e245ba3908f054891420c7626a8df7ecd0329edf1d11246d38e5591cb4530d63969134a34a5065c5ef041004b4 SHA512 41cb67cb02cf5a8eb5a5b929e2a6adcb6dfe376d6ea512d404edf18d0ca85fbec93140f83ee5d8f4980095fc46040cfd27b22f378cc61dcd6e147badd8b1a045 -DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56 -DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4 -EBUILD qemu-guest-agent-4.2.0-r1.ebuild 1775 BLAKE2B 36cde83af7db9939d3a588056b8ca450a8ed3e7e85f229acee3a444c95bb0142c5df8f1b36cfa4c01781bf86f53a1fb4e79a5772ae506a1555cd53287bda402f SHA512 2fff0bb4118da1a168bc5ae4810f37b226be6a83d376fb6a91acb2c45b652a20705d2fab8678f18fce4c53717ac700bd03dfdfaec6a6893fac995fc61203eb63 -EBUILD qemu-guest-agent-5.0.0.ebuild 1775 BLAKE2B 36cde83af7db9939d3a588056b8ca450a8ed3e7e85f229acee3a444c95bb0142c5df8f1b36cfa4c01781bf86f53a1fb4e79a5772ae506a1555cd53287bda402f SHA512 2fff0bb4118da1a168bc5ae4810f37b226be6a83d376fb6a91acb2c45b652a20705d2fab8678f18fce4c53717ac700bd03dfdfaec6a6893fac995fc61203eb63 -EBUILD qemu-guest-agent-6.0.0.ebuild 1631 BLAKE2B 98a108d2796e045fda0abca8ae03171526e37337575ee7c9cb0d1208371d651aa567c983936769635b06b83a7abbf78b95fdb1dc5c22c6f0ce092fb92baa2101 SHA512 39cdfd419756290bb176ea45debfb796564b94d9a9424c11e9f2c7eac2f720a11ff6348deeb8a81bdc075e39e0b7ffb3bd91bbdcd335210fc67731367350adae +DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f +EBUILD qemu-guest-agent-6.0.0.ebuild 1630 BLAKE2B ff8b6f621f26b75374c02e94b151aab8050a1a24d42c787883123899b86c049d98251487065e32846019927aeea939187925d1d8a10fbcf38815e33eca8313d0 SHA512 09c6358e2a145bb0debdece2feb82c36ff277c5d9c4b81efd8f3e3dfe1a7edaf8257bca35a9a76f3871cc2d65cf19912212bb13d4e00ae465ab314d1720b0cc4 +EBUILD qemu-guest-agent-7.1.0.ebuild 1598 BLAKE2B 9bd3e4abfe07cbe6d9795998ced50e1253413f48f28ff92fd064c7f6cc91353339ca8b22233ddfded193214c4cb921509649208f5708ee0395f785e609c86e85 SHA512 0d5bb5b16f943a6e1c9f9c0766347d0f9a7c06c47a93154de60899c018135da66fc112175af065beb1a2a44cd69921e48fc310b9dde387799d4e10b5683d6381 MISC metadata.xml 696 BLAKE2B 3d5f68defa6dc2b19e1e590edf70849bd20e6d23aa3038be3e482485c7848d61f4c45987416daddaa945f5beb4ba3e89e209e28bc04a7495fb5bbe3f2c82533e SHA512 e1b4844ab6d6b4f2e1dcd3c3fca0bc23218819952a3645f874d55cd63d60cbc35216956431aed09708f257d159b70c6813a400460dfc0e64576f2bdcdb6ef1a9 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 f69781694f1d..000000000000 --- 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 94b6a2c8bb3f..000000000000 --- 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 <setjmp.h> - #include <signal.h> - -+#ifdef __linux__ -+#include <sys/sysmacros.h> -+#endif -+ - #ifdef __OpenBSD__ - #include <sys/signal.h> - #endif diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild deleted file mode 100644 index 9318ba4a519e..000000000000 --- a/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit 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" -} diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild index 4a6994942754..407a73b44dae 100644 --- a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild +++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ MY_PN="qemu" MY_P="${MY_PN}-${PV}" SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86" +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" 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-7.1.0.ebuild index 9318ba4a519e..1a76fe360988 100644 --- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild +++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild @@ -1,37 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{8..10} ) -inherit systemd toolchain-funcs udev python-any-r1 +inherit edo systemd toolchain-funcs python-any-r1 udev 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" +SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz" LICENSE="GPL-2 BSD-2" SLOT="0" -IUSE="" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" RDEPEND="dev-libs/glib" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="${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 @@ -44,7 +36,7 @@ src_configure() { --disable-linux-user --disable-system --disable-strip - --disable-tools + --enable-tools --disable-werror --enable-guest-agent --python="${PYTHON}" @@ -52,16 +44,12 @@ src_configure() { --cxx="$(tc-getCXX)" --host-cc="$(tc-getBUILD_CC)" ) - echo "./configure ${myconf[*]}" - ./configure "${myconf[@]}" || die -} -src_compile() { - emake V=1 qemu-ga + edo ./configure "${myconf[@]}" } src_install() { - dobin qemu-ga + dobin build/qga/qemu-ga # Normal init stuff newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent |