From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 28 Jan 2022 13:35:21 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nDQTJ-00Fz27-4B for lore@lore.pengutronix.de; Fri, 28 Jan 2022 13:35:21 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nDQTI-0004WZ-62; Fri, 28 Jan 2022 13:35:20 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nDQTB-0004Vo-F0; Fri, 28 Jan 2022 13:35:13 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nDQTB-00Cz6D-AH; Fri, 28 Jan 2022 13:35:12 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nDQT9-00GxBP-U1; Fri, 28 Jan 2022 13:35:12 +0100 Date: Fri, 28 Jan 2022 13:35:11 +0100 From: Michael Olbrich To: Matthias Fend Message-ID: Mail-Followup-To: Matthias Fend , ptxdist@pengutronix.de References: <20220120085436.760446-1-matthias.fend@emfend.at> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH] media-session: use install_alternative for configuration files X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Hi, On Sun, Jan 23, 2022 at 10:49:27PM +0100, Matthias Fend wrote: > Am 21.01.2022 um 13:25 schrieb Michael Olbrich: > > On Thu, Jan 20, 2022 at 09:54:36AM +0100, Matthias Fend wrote: > > > This allows customization of the configuration files in projectroot. > > > > Hmmm, these files are supposed to be overwritten in /etc/ if you need a > > custom version. I'm not sure if we should replace the original files. > > Yes that's right. > Here are just a few of my thoughts. > I thought it is the usual case when the package rules file also installs the > configuration files and I don't know if there is an 'install a file from > projectroot if present'-function. > Also, I found that a second set of configuration files is unnecessary for an > embedded system. > With this rule change, a user could still choose to change the configuration > in /usr/share or install additional files in /etc in their own rule. Hmm, it doesn't really hurt. I'll think about it some more, but I think I'll apply it. Michael > However, you have the best knowledge to choose a solution that conforms to > the existing rules. > > Thanks, > ~Matthias > > > > > > Michael > > > > > Signed-off-by: Matthias Fend > > > --- > > > rules/media-session.make | 8 ++++---- > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/rules/media-session.make b/rules/media-session.make > > > index cda641294..5a90bc273 100644 > > > --- a/rules/media-session.make > > > +++ b/rules/media-session.make > > > @@ -78,13 +78,13 @@ ifdef PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT_USER > > > /usr/lib/systemd/user/pipewire.service.wants/pipewire-media-session.service) > > > endif > > > - @$(call install_copy, media-session, 0, 0, 644, -, \ > > > + @$(call install_alternative, media-session, 0, 0, 0644, \ > > > /usr/share/pipewire/media-session.d/alsa-monitor.conf) > > > - @$(call install_copy, media-session, 0, 0, 644, -, \ > > > + @$(call install_alternative, media-session, 0, 0, 0644, \ > > > /usr/share/pipewire/media-session.d/bluez-monitor.conf) > > > - @$(call install_copy, media-session, 0, 0, 644, -, \ > > > + @$(call install_alternative, media-session, 0, 0, 0644, \ > > > /usr/share/pipewire/media-session.d/media-session.conf) > > > - @$(call install_copy, media-session, 0, 0, 644, -, \ > > > + @$(call install_alternative, media-session, 0, 0, 0644, \ > > > /usr/share/pipewire/media-session.d/v4l2-monitor.conf) > > > @$(call install_finish, media-session) > > > -- > > > 2.25.1 > > > > > > > > > _______________________________________________ > > > ptxdist mailing list > > > ptxdist@pengutronix.de > > > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > > > > > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de