diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-19 10:47:37 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-19 11:58:03 +0200 |
| commit | 808a7ea2eb535a21ab5170d5334da8dff9b3ad81 (patch) | |
| tree | 638b446ff210eb81f88808634e217628ae19070a /rules/chrony.make | |
| parent | 26dd4d28c9d65ffcaced8af0c8979a7c451c6413 (diff) | |
| download | ptxdist-808a7ea2eb535a21ab5170d5334da8dff9b3ad81.tar.gz ptxdist-808a7ea2eb535a21ab5170d5334da8dff9b3ad81.tar.xz | |
chrony: migrate to install_alternative
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/chrony.make')
| -rw-r--r-- | rules/chrony.make | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/rules/chrony.make b/rules/chrony.make index 140f46857..fac604cf8 100644 --- a/rules/chrony.make +++ b/rules/chrony.make @@ -60,41 +60,20 @@ $(STATEDIR)/chrony.targetinstall: # command helper script ifdef PTXCONF_CHRONY_INSTALL_CHRONY_COMMAND - @$(call install_copy, chrony, 0, 0, 0755, \ - $(PTXDIST_TOPDIR)/generic/usr/bin/chrony_command, \ - /usr/bin/chrony_command) + @$(call install_alternative, chrony, 0, 0, 0755, /usr/bin/chrony_command) endif # chrony stat convenience wrapper ifdef PTXCONF_CHRONY_INSTALL_CHRONY_STAT - @$(call install_copy, chrony, 0, 0, 0755, \ - $(PTXDIST_TOPDIR)/generic/usr/bin/chrony_stat, \ - /usr/bin/chrony_stat) + @$(call install_alternative, chrony, 0, 0, 0755, /usr/bin/chrony_stat) endif - # generic one -ifdef PTXCONF_CHRONY_DEFAULTCONFIG - @$(call install_copy, chrony, 0, 0, 0644, \ - $(PTXDIST_TOPDIR)/generic/etc/chrony/chrony.conf, \ - /etc/chrony/chrony.conf) - @$(call install_copy, chrony, 0, 0, 0600, \ - $(PTXDIST_TOPDIR)/generic/etc/chrony/chrony.keys, \ - /etc/chrony/chrony.keys) -endif - -# users one -ifdef PTXCONF_CHRONY_USERCONFIG - @$(call install_copy, chrony, 0, 0, 0644, \ - $(PTXDIST_WORKSPACE)/projectroot/etc/chrony/chrony.conf, \ - /etc/chrony/chrony.conf) - @$(call install_copy, chrony, 0, 0, 0600, \ - $(PTXDIST_WORKSPACE)/projectroot/etc/chrony/chrony.keys, \ - /etc/chrony/chrony.keys) -endif +ifdef PTXCONF_CHRONY_INSTALL_CONFIG + @$(call install_alternative, chrony, 0, 0, 0644, /etc/chrony/chrony.conf) + @$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony/chrony.keys) # modify placeholders with data from configuration -ifdef PTXCONF_CHRONY_INSTALL_CONFIG @$(call install_replace, chrony, /etc/chrony/chrony.conf, \ @UNCONFIGURED_CHRONY_SERVER_IP@, $(PTXCONF_CHRONY_DEFAULT_NTP_SERVER)) |