summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-06-02 06:05:30 +0100
committerSam James <sam@gentoo.org>2024-06-02 06:11:35 +0100
commita70f6f672af3a2f0855f24c7d112e9f83bc01f03 (patch)
treee4c0fe75833cecf77ead8f3b246a6e718ddc1d05 /app-emulation/qemu-guest-agent
parentapp-emulation/qemu-guest-agent: disable py3.9 (diff)
downloadgentoo-a70f6f672af3a2f0855f24c7d112e9f83bc01f03.tar.gz
gentoo-a70f6f672af3a2f0855f24c7d112e9f83bc01f03.tar.bz2
gentoo-a70f6f672af3a2f0855f24c7d112e9f83bc01f03.zip
app-emulation/qemu-guest-agent: drop 7.1.0, 8.0.3
(Close a bunch of old bugs which are long-fixed, including some from before the tests got reworked.) Closes: https://bugs.gentoo.org/790677 Closes: https://bugs.gentoo.org/801679 Closes: https://bugs.gentoo.org/828422 Closes: https://bugs.gentoo.org/829448 Closes; https://bugs.gentoo.org/833998 Closes: https://bugs.gentoo.org/885673 Closes: https://bugs.gentoo.org/908699 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation/qemu-guest-agent')
-rw-r--r--app-emulation/qemu-guest-agent/Manifest2
-rw-r--r--app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch85
-rw-r--r--app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild82
-rw-r--r--app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild82
4 files changed, 0 insertions, 251 deletions
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 3cd596c49dfa..c11c1afbfabd 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -1,3 +1 @@
-DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
-DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3 SHA512 18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
DIST qemu-8.2.0.tar.xz 130008888 BLAKE2B a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3 SHA512 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c
diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch
deleted file mode 100644
index dff62304a5c7..000000000000
--- a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 33ab5f24913db8d5590fe4155829bd38e7902506 Mon Sep 17 00:00:00 2001
-Message-Id: <33ab5f24913db8d5590fe4155829bd38e7902506.1666164897.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 14 Oct 2022 09:30:15 +0200
-Subject: [PATCH] configure: Avoid using strings binary
-
-When determining the endiandness of the target architecture we're
-building for a small program is compiled, which in an obfuscated
-way declares two strings. Then, we look which string is in
-correct order (using strings binary) and deduct the endiandness.
-But using the strings binary is problematic, because it's part of
-toolchain (strings is just a symlink to
-x86_64-pc-linux-gnu-strings or llvm-strings). And when
-(cross-)compiling, it requires users to set the symlink to the
-correct toolchain.
-
-Fortunately, we have a better alternative anyways. We can mimic
-what compiler.h is already doing: comparing __BYTE_ORDER__
-against values for little/big endiandness.
-
-Bug: https://bugs.gentoo.org/876933
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <d6d9c7043cfe6d976d96694f2b4ecf85cf3206f1.1665732504.git.mprivozn@redhat.com>
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- configure | 35 ++++++++++++++++++-----------------
- 1 file changed, 18 insertions(+), 17 deletions(-)
-
-diff --git a/configure b/configure
-index f9ec050bf8..81561be7c1 100755
---- a/configure
-+++ b/configure
-@@ -1423,30 +1423,31 @@ if test "$tcg" = "enabled"; then
- git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
- fi
-
--# ---
-+##########################################
- # big/little endian test
- cat > $TMPC << EOF
--#include <stdio.h>
--short big_endian[] = { 0x4269, 0x4765, 0x4e64, 0x4961, 0x4e00, 0, };
--short little_endian[] = { 0x694c, 0x7454, 0x654c, 0x6e45, 0x6944, 0x6e41, 0, };
--int main(int argc, char *argv[])
--{
-- return printf("%s %s\n", (char *)big_endian, (char *)little_endian);
--}
-+#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+# error LITTLE
-+#endif
-+int main(void) { return 0; }
- EOF
-
--if compile_prog ; then
-- if strings -a $TMPE | grep -q BiGeNdIaN ; then
-- bigendian="yes"
-- elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then
-- bigendian="no"
-- else
-- echo big/little test failed
-- exit 1
-- fi
-+if ! compile_prog ; then
-+ bigendian="no"
- else
-+ cat > $TMPC << EOF
-+#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+# error BIG
-+#endif
-+int main(void) { return 0; }
-+EOF
-+
-+ if ! compile_prog ; then
-+ bigendian="yes"
-+ else
- echo big/little test failed
- exit 1
-+ fi
- fi
-
- ##########################################
---
-2.37.3
-
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
deleted file mode 100644
index d9c076eaa2d6..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit edo systemd toolchain-funcs python-any-r1 udev
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-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"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="dev-libs/glib"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- dev-lang/perl
- app-alternatives/ninja"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.1.0-configure-Avoid-using-strings-binary.patch
-)
-
-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
- --enable-tools
- --disable-werror
- --enable-guest-agent
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- )
-
- edo ./configure "${myconf[@]}"
-}
-
-src_install() {
- dobin build/qga/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"
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
deleted file mode 100644
index 65868466c2ba..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit edo systemd toolchain-funcs python-any-r1 udev
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-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"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="dev-libs/glib"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- dev-lang/perl
- app-alternatives/ninja"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-)
-
-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
- --enable-tools
- --disable-werror
- --without-default-features
- --enable-guest-agent
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- )
-
- edo ./configure "${myconf[@]}"
-}
-
-src_install() {
- dobin build/qga/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"
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}