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 8EB2215808E for ; Fri, 29 Apr 2022 05:58:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEEB7E0825; Fri, 29 Apr 2022 05:58:33 +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 B3946E0825 for ; Fri, 29 Apr 2022 05:58:33 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1094341AB5 for ; Fri, 29 Apr 2022 05:58:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C6343BC for ; Fri, 29 Apr 2022 05:58:31 +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: <1651211904.11ce9a87c1fce843a4753e3deaf94cacb7a8aec0.sam@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/sof-firmware-2.1.1-r1.ebuild sys-firmware/sof-firmware/sof-firmware-2.1.1.ebuild X-VCS-Directories: sys-firmware/sof-firmware/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 11ce9a87c1fce843a4753e3deaf94cacb7a8aec0 X-VCS-Branch: master Date: Fri, 29 Apr 2022 05:58:31 +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: 1add9b70-fb50-444d-b149-b7d810140faa X-Archives-Hash: 803dc8a007574cd12577da50fd356505 commit: 11ce9a87c1fce843a4753e3deaf94cacb7a8aec0 Author: Sam James gentoo org> AuthorDate: Fri Apr 29 05:58:09 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 29 05:58:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ce9a87 sys-firmware/sof-firmware: fix pkg_preinst Closes: https://bugs.gentoo.org/841560 Signed-off-by: Sam James gentoo.org> .../{sof-firmware-2.1.1.ebuild => sof-firmware-2.1.1-r1.ebuild} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-firmware/sof-firmware/sof-firmware-2.1.1.ebuild b/sys-firmware/sof-firmware/sof-firmware-2.1.1-r1.ebuild similarity index 88% rename from sys-firmware/sof-firmware/sof-firmware-2.1.1.ebuild rename to sys-firmware/sof-firmware/sof-firmware-2.1.1-r1.ebuild index fd66eee7a67b..b51c9026bd32 100644 --- a/sys-firmware/sof-firmware/sof-firmware-2.1.1.ebuild +++ b/sys-firmware/sof-firmware/sof-firmware-2.1.1-r1.ebuild @@ -12,6 +12,9 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" +# Needed for sof-ctl +RDEPEND="media-libs/alsa-lib" + QA_PREBUILT="usr/bin/sof-ctl usr/bin/sof-logger usr/bin/sof-probes" @@ -24,7 +27,7 @@ src_install() { pkg_preinst() { local sofpath="${EROOT}/lib/firmware/intel/sof" - if [[ ! -L "${sofpath}" ]] ; then + if [[ ! -L "${sofpath}" && -d "${sofpath}" ]] ; then rm -r "${sofpath}" || die fi }