From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E29B158089 for ; Wed, 6 Sep 2023 09:06:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB8842BC016; Wed, 6 Sep 2023 09:06:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A09AC2BC016 for ; Wed, 6 Sep 2023 09:06:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C817E335CB7 for ; Wed, 6 Sep 2023 09:06:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23C6E1124 for ; Wed, 6 Sep 2023 09:06:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1693991144.0e33bcc6940a140cc273a66c41bd69d8ee4f5ba2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0e33bcc6940a140cc273a66c41bd69d8ee4f5ba2 X-VCS-Branch: master Date: Wed, 6 Sep 2023 09:06:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1167cb28-7e40-49d3-84aa-d893972d9ce0 X-Archives-Hash: fa9f2a9a1e1c46b77ca83e06c9eeaccd commit: 0e33bcc6940a140cc273a66c41bd69d8ee4f5ba2 Author: Michal Privoznik gmail com> AuthorDate: Mon Aug 28 08:31:29 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Sep 6 09:05:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e33bcc6 app-emulation/qemu: Adapt live ebuild to meson subprojects The upstream is moving away from explicit git submodules to meson subprojects. This renders EGIT_SUBMODULES useless (wrt submodules we care about), but as there are still some submodules (that we don't care about) set the variable to empty array. Unfortunately, our meson.eclass doesn't support subpojects yet, therefore mimic what at least one other ebuild does (sys-apps/dbus-broker): provide an alternative implementation of src_unpack() for the live ebuild that downloads additional repositories via 'meson subprojects download'. The non-live ebuilds do not need this because the release archive contains bundles all subprojects. Signed-off-by: Michal Privoznik gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32484 Signed-off-by: Sam James gentoo.org> app-emulation/qemu/qemu-9999.ebuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index cca0a24a89c0..6ca0885e7e59 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -25,11 +25,7 @@ if [[ ${PV} == *9999* ]]; then QEMU_DOCS_PREBUILT=0 EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/" - EGIT_SUBMODULES=( - tests/fp/berkeley-softfloat-3 - tests/fp/berkeley-testfloat-3 - subprojects/keycodemapdb - ) + EGIT_SUBMODULES=() inherit git-r3 SRC_URI="" else @@ -440,6 +436,14 @@ check_targets() { popd >/dev/null } +if [[ ${PV} == 9999 ]]; then +src_unpack() { + git-r3_src_unpack + cd "${P}" || die + meson subprojects download keycodemapdb berkeley-softfloat-3 berkeley-testfloat-3 || die +} +fi + src_prepare() { check_targets IUSE_SOFTMMU_TARGETS softmmu check_targets IUSE_USER_TARGETS linux-user @@ -454,7 +458,7 @@ src_prepare() { MAKEOPTS+=" V=1" # Remove bundled modules - rm -r subprojects/dtc roms/*/ || die + rm -r roms/*/ || die } ##