From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-oa0-f44.google.com ([209.85.219.44]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1TYjw2-00012Z-FF for ptxdist@pengutronix.de; Wed, 14 Nov 2012 21:51:47 +0100 Received: by mail-oa0-f44.google.com with SMTP id n5so995673oag.31 for ; Wed, 14 Nov 2012 12:51:39 -0800 (PST) From: George McCollister Date: Wed, 14 Nov 2012 14:51:30 -0600 Message-Id: <1352926290-28469-1-git-send-email-george.mccollister@gmail.com> Subject: [ptxdist] [PATCH] systemd: use install_alternative_tree Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de The contents of the following often need to be customized: /etc/systemd/system /lib/systemd/system /usr/lib/tmpfiles.d Using install_alternative_tree instead of install_tree will allow customizations. Signed-off-by: George McCollister --- rules/systemd.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/systemd.make b/rules/systemd.make index 4d3cace..0f78553 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -199,8 +199,8 @@ endif /etc/systemd/journald.conf) @$(call install_alternative, systemd, 0, 0, 0644, \ /etc/systemd/logind.conf) - @$(call install_tree, systemd, 0, 0, -, /etc/systemd/system/) - @$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/) + @$(call install_alternative_tree, systemd, 0, 0, /etc/systemd/system/) + @$(call install_alternative_tree, systemd, 0, 0, /usr/lib/tmpfiles.d/) @$(call install_copy, systemd, 0, 0, 0644, -, /lib/udev/rules.d/99-systemd.rules) @$(call install_tree, systemd, 0, 0, -, /etc/dbus-1/system.d/) @$(call install_tree, systemd, 0, 0, -, /usr/share/polkit-1/actions/) @@ -209,7 +209,7 @@ endif @$(call install_copy, systemd, 0, 0, 0644, -, /usr/share/systemd/kbd-model-map) # # units - @$(call install_tree, systemd, 0, 0, -, /lib/systemd/system/) + @$(call install_alternative_tree, systemd, 0, 0, /lib/systemd/system/) @$(call install_alternative, systemd, 0, 0, 0644, /etc/vconsole.conf) -- 1.7.11.2 -- ptxdist mailing list ptxdist@pengutronix.de