* [ptxdist] [PATCH] media-session: use install_alternative for configuration files @ 2022-01-20 8:54 Matthias Fend 2022-01-21 12:25 ` Michael Olbrich 2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich 0 siblings, 2 replies; 5+ messages in thread From: Matthias Fend @ 2022-01-20 8:54 UTC (permalink / raw) To: ptxdist This allows customization of the configuration files in projectroot. Signed-off-by: Matthias Fend <matthias.fend@emfend.at> --- 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] media-session: use install_alternative for configuration files 2022-01-20 8:54 [ptxdist] [PATCH] media-session: use install_alternative for configuration files Matthias Fend @ 2022-01-21 12:25 ` Michael Olbrich 2022-01-23 21:49 ` Matthias Fend 2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich 1 sibling, 1 reply; 5+ messages in thread From: Michael Olbrich @ 2022-01-21 12:25 UTC (permalink / raw) To: Matthias Fend; +Cc: ptxdist 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. Michael > Signed-off-by: Matthias Fend <matthias.fend@emfend.at> > --- > 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 > -- 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] media-session: use install_alternative for configuration files 2022-01-21 12:25 ` Michael Olbrich @ 2022-01-23 21:49 ` Matthias Fend 2022-01-28 12:35 ` Michael Olbrich 0 siblings, 1 reply; 5+ messages in thread From: Matthias Fend @ 2022-01-23 21:49 UTC (permalink / raw) To: ptxdist Hi Michael, 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. However, you have the best knowledge to choose a solution that conforms to the existing rules. Thanks, ~Matthias > > Michael > >> Signed-off-by: Matthias Fend <matthias.fend@emfend.at> >> --- >> 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] media-session: use install_alternative for configuration files 2022-01-23 21:49 ` Matthias Fend @ 2022-01-28 12:35 ` Michael Olbrich 0 siblings, 0 replies; 5+ messages in thread From: Michael Olbrich @ 2022-01-28 12:35 UTC (permalink / raw) To: Matthias Fend; +Cc: ptxdist 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 <matthias.fend@emfend.at> > > > --- > > > 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [APPLIED] media-session: use install_alternative for configuration files 2022-01-20 8:54 [ptxdist] [PATCH] media-session: use install_alternative for configuration files Matthias Fend 2022-01-21 12:25 ` Michael Olbrich @ 2022-01-30 15:49 ` Michael Olbrich 1 sibling, 0 replies; 5+ messages in thread From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw) To: ptxdist; +Cc: Matthias Fend Thanks, applied as ad99a7d2d8ffcdde33e582e7dcd277b618378b6b. Michael [sent from post-receive hook] On Sun, 30 Jan 2022 16:49:26 +0100, Matthias Fend <matthias.fend@emfend.at> wrote: > This allows customization of the configuration files in projectroot. > > Signed-off-by: Matthias Fend <matthias.fend@emfend.at> > Message-Id: <20220120085436.760446-1-matthias.fend@emfend.at> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/media-session.make b/rules/media-session.make > index cda641294f54..5a90bc2732e2 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) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-30 15:50 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-01-20 8:54 [ptxdist] [PATCH] media-session: use install_alternative for configuration files Matthias Fend 2022-01-21 12:25 ` Michael Olbrich 2022-01-23 21:49 ` Matthias Fend 2022-01-28 12:35 ` Michael Olbrich 2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox