Re: [ptxdist] [PATCH] media-session: use install_alternative for configuration files

[Matthias Fend]

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.f...@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-requ...@pengutronix.de



_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de