commit: ce974471d1bc7a9b33fa138f54f35f0e9bc7a77b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Aug 26 03:49:00 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 26 03:49:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce974471
app-emulation/qemu: add 8.1.0 Fix some test failures too (skip a test which fails for me, probably kernel config or network-sandbox related + crank up timeouts). Closes: https://bugs.gentoo.org/865647 Closes: https://bugs.gentoo.org/867766 Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/qemu/Manifest | 2 + .../qemu/files/qemu-8.1.0-find-sphinx.patch | 10 ++++ .../qemu/files/qemu-8.1.0-skip-tests.patch | 64 ++++++++++++++++++++++ .../qemu/{qemu-9999.ebuild => qemu-8.1.0.ebuild} | 21 +++---- app-emulation/qemu/qemu-9999.ebuild | 19 +++---- 5 files changed, 93 insertions(+), 23 deletions(-) diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index e871a96f3f50..76f90e7c8da0 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -8,3 +8,5 @@ DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 9b54aae10fe09691a26e68374723ded5fdda640 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a SHA512 4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3 SHA512 18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915 SHA512 bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449 +DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e SHA512 905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9 +DIST qemu-8.1.0.tar.xz 123550284 BLAKE2B b0fd87a19b13d4bbc6526caa46533073cb4dee6004df5d4fbbef204ee3bc8c2f10ec1eaff554adbb25c9f3143dd68abd09d4a0519c4766299a3ff261d03c73f2 SHA512 c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c diff --git a/app-emulation/qemu/files/qemu-8.1.0-find-sphinx.patch b/app-emulation/qemu/files/qemu-8.1.0-find-sphinx.patch new file mode 100644 index 000000000000..b6ef6214af55 --- /dev/null +++ b/app-emulation/qemu/files/qemu-8.1.0-find-sphinx.patch @@ -0,0 +1,10 @@ +This gets confused by python-any-r1 and tries to find sphinx-build in ${T}. +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -1,5 +1,4 @@ +-sphinx_build = find_program(fs.parent(python.full_path()) / 'sphinx-build', +- required: get_option('docs')) ++sphinx_build = find_program('sphinx-build', required: get_option('docs')) + + # Check if tools are available to build documentation. + build_docs = false diff --git a/app-emulation/qemu/files/qemu-8.1.0-skip-tests.patch b/app-emulation/qemu/files/qemu-8.1.0-skip-tests.patch new file mode 100644 index 000000000000..f668584e8d4b --- /dev/null +++ b/app-emulation/qemu/files/qemu-8.1.0-skip-tests.patch @@ -0,0 +1,64 @@ +* netdev-socket.c +qtest-i386/netdev-socket fails with: +``` +stderr: +qemu-system-i386: -netdev dgram,id=st0,remote.type=inet,remote.host=230.0.0.1,remote.port=1234: can't add socket to multicast group 230.0.0.1: No such device +Broken pipe +../tests/qtest/libqtest.c:191: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) +``` + +* vhost-user-test.c +qtest-x86_64/qos-test fails with a timeout: +``` +qemu-system-x86_64: Failed to set msg fds. +qemu-system-x86_64: vhost VQ 0 ring restore failed: -22: Invalid argument (22) +qemu-system-x86_64: Failed to set msg fds. +qemu-system-x86_64: vhost VQ 1 ring restore failed: -22: Invalid argument (22) +** +ERROR:../tests/qtest/vhost-user-test.c:892:wait_for_rings_started: assertion failed (ctpop64(s->rings) == count): (1 == 2) +** +ERROR:../tests/qtest/qos-test.c:191:subprocess_run_one_test: child process (/x86_64/pc/i440FX-pcihost/pci-bus-pc/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/reconnect/subprocess [6082]) failed unexpectedl +``` + +--- a/tests/qtest/netdev-socket.c ++++ b/tests/qtest/netdev-socket.c +@@ -498,6 +498,10 @@ int main(int argc, char **argv) + socket_init(); + g_test_init(&argc, &argv, NULL); + ++ /* XXX: Skip test for now on Gentoo, fails with "No such device" */ ++ g_test_skip("Skipping test known to fail on Gentoo"); ++ return 0; ++ + if (socket_check_protocol_support(&has_ipv4, &has_ipv6) < 0) { + g_error("socket_check_protocol_support() failed\n"); + } +--- a/tests/qtest/vhost-user-test.c ++++ b/tests/qtest/vhost-user-test.c +@@ -243,7 +243,7 @@ static bool wait_for_fds(TestServer *s) + + g_mutex_lock(&s->data_mutex); + +- end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; ++ end_time = g_get_monotonic_time() + 30 * G_TIME_SPAN_SECOND; + while (!s->fds_num) { + if (!g_cond_wait_until(&s->data_cond, &s->data_mutex, end_time)) { + /* timeout has passed */ +@@ -672,7 +672,7 @@ static void wait_for_log_fd(TestServer *s) + gint64 end_time; + + g_mutex_lock(&s->data_mutex); +- end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; ++ end_time = g_get_monotonic_time() + 30 * G_TIME_SPAN_SECOND; + while (s->log_fd == -1) { + if (!g_cond_wait_until(&s->data_cond, &s->data_mutex, end_time)) { + /* timeout has passed */ +@@ -885,7 +885,7 @@ static void wait_for_rings_started(TestServer *s, size_t count) + gint64 end_time; + + g_mutex_lock(&s->data_mutex); +- end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; ++ end_time = g_get_monotonic_time() + 30 * G_TIME_SPAN_SECOND; + while (ctpop64(s->rings) != count) { + if (!g_cond_wait_until(&s->data_cond, &s->data_mutex, end_time)) { + /* timeout has passed */ diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-8.1.0.ebuild similarity index 98% copy from app-emulation/qemu/qemu-9999.ebuild copy to app-emulation/qemu/qemu-8.1.0.ebuild index 2fccbf5de576..9fb08f07e76f 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-8.1.0.ebuild @@ -6,14 +6,14 @@ EAPI=8 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs # Set to 1 if prebuilt, 0 if not # (the construct below is to allow overriding from env for script) -QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0} +QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1} QEMU_DOCS_PREBUILT_DEV=sam QEMU_DOCS_VERSION=$(ver_cut 1-3) # Default to generating docs (inc. man pages) if no prebuilt; overridden later # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11,12} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -204,7 +204,7 @@ SOFTMMU_TOOLS_DEPEND=" media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) - pipewire? ( media-video/pipewire ) + pipewire? ( >=media-video/pipewire-0.3.60 ) png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] ) pulseaudio? ( media-libs/libpulse ) rbd? ( sys-cluster/ceph ) @@ -271,11 +271,10 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson - sys-apps/texinfo + >=dev-util/meson-0.63.0 virtual/pkgconfig doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}] dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] ) gtk? ( nls? ( sys-devel/gettext ) ) @@ -310,6 +309,8 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch "${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-8.1.0-skip-tests.patch + "${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch ) QA_PREBUILT=" @@ -450,11 +451,6 @@ src_prepare() { # Verbose builds MAKEOPTS+=" V=1" - # We already force -D_FORTIFY_SOURCE=2 (or 3) in our toolchain, but - # this setting (-U then -D..=2) will prevent us from trying out 3, so - # drop it. No change to level of protection b/c we patch our toolchain. - sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die - # Remove bundled modules rm -r subprojects/dtc roms/*/ || die } @@ -484,7 +480,7 @@ qemu_src_configure() { --disable-containers # bug #732972 --disable-guest-agent --disable-strip - --with-git-submodules=ignore + --disable-download # bug #746752: TCG interpreter has a few limitations: # - it does not support FPU @@ -503,6 +499,7 @@ qemu_src_configure() { --disable-gcrypt --cc="$(tc-getCC)" --cxx="$(tc-getCXX)" + --objcc="$(tc-getCC)" --host-cc="$(tc-getBUILD_CC)" $(use_enable alsa) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 2fccbf5de576..e9ea36363d60 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-3) # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11,12} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -204,7 +204,7 @@ SOFTMMU_TOOLS_DEPEND=" media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) - pipewire? ( media-video/pipewire ) + pipewire? ( >=media-video/pipewire-0.3.60 ) png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] ) pulseaudio? ( media-libs/libpulse ) rbd? ( sys-cluster/ceph ) @@ -271,11 +271,10 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson - sys-apps/texinfo + >=dev-util/meson-0.63.0 virtual/pkgconfig doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}] dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] ) gtk? ( nls? ( sys-devel/gettext ) ) @@ -310,6 +309,8 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch "${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-8.1.0-skip-tests.patch + "${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch ) QA_PREBUILT=" @@ -450,11 +451,6 @@ src_prepare() { # Verbose builds MAKEOPTS+=" V=1" - # We already force -D_FORTIFY_SOURCE=2 (or 3) in our toolchain, but - # this setting (-U then -D..=2) will prevent us from trying out 3, so - # drop it. No change to level of protection b/c we patch our toolchain. - sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die - # Remove bundled modules rm -r subprojects/dtc roms/*/ || die } @@ -484,7 +480,7 @@ qemu_src_configure() { --disable-containers # bug #732972 --disable-guest-agent --disable-strip - --with-git-submodules=ignore + --disable-download # bug #746752: TCG interpreter has a few limitations: # - it does not support FPU @@ -503,6 +499,7 @@ qemu_src_configure() { --disable-gcrypt --cc="$(tc-getCC)" --cxx="$(tc-getCXX)" + --objcc="$(tc-getCC)" --host-cc="$(tc-getBUILD_CC)" $(use_enable alsa)
