From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Sun, 30 Jan 2022 16:50:31 +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 <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1nECTH-000p9a-5U
	for lore@lore.pengutronix.de; Sun, 30 Jan 2022 16:50:31 +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 <ptxdist-bounces@pengutronix.de>)
	id 1nECTG-0006kp-LS; Sun, 30 Jan 2022 16:50:30 +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 <mol@pengutronix.de>)
 id 1nECSH-0006PU-6S; Sun, 30 Jan 2022 16:49:29 +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 <mol@pengutronix.de>)
 id 1nECSG-00DSAh-NB; Sun, 30 Jan 2022 16:49:27 +0100
Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1nECSF-00028q-4k; Sun, 30 Jan 2022 16:49:27 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Sun, 30 Jan 2022 16:49:27 +0100
Message-Id: <20220130154927.8189-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220120085436.760446-1-matthias.fend@emfend.at>
References: <20220120085436.760446-1-matthias.fend@emfend.at>
MIME-Version: 1.0
Subject: Re: [ptxdist] [APPLIED] 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 <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Matthias Fend <matthias.fend@emfend.at>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
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

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