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 D6B98158013 for ; Sun, 10 Dec 2023 01:44:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F92B2BC022; Sun, 10 Dec 2023 01:44:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 057CD2BC022 for ; Sun, 10 Dec 2023 01:44:55 +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 35E8F33BE18 for ; Sun, 10 Dec 2023 01:44:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A227118F for ; Sun, 10 Dec 2023 01:44:52 +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: <1702172658.fa40a68813842842cae00dac90450cf3e1b979ce.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/wireplumber/wireplumber-0.4.17-r1.ebuild media-video/wireplumber/wireplumber-9999.ebuild X-VCS-Directories: media-video/wireplumber/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fa40a68813842842cae00dac90450cf3e1b979ce X-VCS-Branch: master Date: Sun, 10 Dec 2023 01:44:52 +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: a5d0c186-9aa6-4c42-bade-d536effaf3cf X-Archives-Hash: dcd44d6f1c3c2764d3e5d5d84d61c35d commit: fa40a68813842842cae00dac90450cf3e1b979ce Author: James Calligeros gmail com> AuthorDate: Sun Dec 10 00:59:53 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 10 01:44:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa40a688 media-video/wireplumber: don't copy default configs to /etc/ Wireplumber does not tolerate having its default config split across /etc/ and /usr/share/. It has also recently acquired features which allow system integrators and other interested third parties to ship customised configuration packages to better integrate oddball hardware, such as Apple Silicon Macs. These configs naturally live in /usr/share/, since they are not user-created. As /etc/ takes precedence over /usr/share/, having the OOTB config there prevents these custom configs from being loaded properly. This commit removes the step which copies the OOTB config to /etc/, which matches the behaviour expected (and now arguably required) upstream. Users are responsible for adding their own overrides to /etc/ should they so choose. Signed-off-by: James Calligeros gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34207 Signed-off-by: Sam James gentoo.org> .../{wireplumber-9999.ebuild => wireplumber-0.4.17-r1.ebuild} | 11 ----------- media-video/wireplumber/wireplumber-9999.ebuild | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-0.4.17-r1.ebuild similarity index 91% copy from media-video/wireplumber/wireplumber-9999.ebuild copy to media-video/wireplumber/wireplumber-0.4.17-r1.ebuild index 02516dabf6eb..42e484bf9447 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.17-r1.ebuild @@ -95,17 +95,6 @@ src_configure() { meson_src_configure } -src_install() { - meson_src_install - - # We copy the default config, so that Gentoo tools can pick up on any - # updates and /etc does not end up with stale overrides. - # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files - # will not actually get stored twice until modified. - insinto /etc - doins -r "${ED}"/usr/share/wireplumber -} - pkg_postinst() { if systemd_is_booted ; then ewarn "pipewire-media-session.service is no longer installed. You must switch" diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild index 02516dabf6eb..42e484bf9447 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-9999.ebuild @@ -95,17 +95,6 @@ src_configure() { meson_src_configure } -src_install() { - meson_src_install - - # We copy the default config, so that Gentoo tools can pick up on any - # updates and /etc does not end up with stale overrides. - # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files - # will not actually get stored twice until modified. - insinto /etc - doins -r "${ED}"/usr/share/wireplumber -} - pkg_postinst() { if systemd_is_booted ; then ewarn "pipewire-media-session.service is no longer installed. You must switch"