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 21B6B158043 for ; Sun, 7 Apr 2024 16:44:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D98DBE29E6; Sun, 7 Apr 2024 16:44:18 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD031E29E6 for ; Sun, 7 Apr 2024 16:44:18 +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 9565434331E for ; Sun, 7 Apr 2024 16:44:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBD251698 for ; Sun, 7 Apr 2024 16:44:15 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1712508233.88e19836b7e95385022c432f6eaefde123b49c73.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-firmware/sof-firmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-firmware/sof-firmware/metadata.xml sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild X-VCS-Directories: sys-firmware/sof-firmware/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 88e19836b7e95385022c432f6eaefde123b49c73 X-VCS-Branch: master Date: Sun, 7 Apr 2024 16:44:15 +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: 23999636-297f-46e6-8db0-f0353f7aff98 X-Archives-Hash: d9a16cd7072394f3bed010a18a7931c7 commit: 88e19836b7e95385022c432f6eaefde123b49c73 Author: Pacho Ramos gentoo org> AuthorDate: Sun Apr 7 16:33:04 2024 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Apr 7 16:43:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88e19836 sys-firmware/sof-firmware: Allow to skip glibc requirement Useful for MUSL based systems as commented in: https://www.reddit.com/r/voidlinux/comments/rbq4ns/comment/im2r0bp/ Closes: https://bugs.gentoo.org/925179 Signed-off-by: Pacho Ramos gentoo.org> sys-firmware/sof-firmware/metadata.xml | 3 +++ sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sys-firmware/sof-firmware/metadata.xml b/sys-firmware/sof-firmware/metadata.xml index 6f44d28b9bc7..5933a501e2ec 100644 --- a/sys-firmware/sof-firmware/metadata.xml +++ b/sys-firmware/sof-firmware/metadata.xml @@ -7,6 +7,9 @@ alsa-bugs@gentoo.org + + Tools to interact with sof firmwares (upstream expects them to be present, but allow to skip them for systems not able to install needed dependencies) + thesofproject/sof diff --git a/sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild b/sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild index ac48a808c83e..105eaae58f37 100644 --- a/sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild +++ b/sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild @@ -11,10 +11,13 @@ S="${WORKDIR}"/sof-bin-${PV} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" +IUSE="+tools" RDEPEND=" - media-libs/alsa-lib - sys-libs/glibc + tools? ( + media-libs/alsa-lib + sys-libs/glibc + ) " QA_PREBUILT="usr/bin/sof-ctl @@ -25,6 +28,12 @@ src_install() { dodir /lib/firmware/intel dodir /usr/bin FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" || die + + # Drop tools if requested (i.e. useful for musl systems, where glibc + # is not available) + if ! use tools ; then + rm -rv "${D}"/usr/bin || die + fi } pkg_preinst() {