projects
/
openwrt
/
staging
/
hauke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ccfa82
)
busybox: don't install NTP scripts if NTP isn't configured
author
Philip Prindeville
<
[email protected]
>
Mon, 6 Feb 2017 22:26:49 +0000
(15:26 -0700)
committer
Jo-Philipp Wich
<
[email protected]
>
Wed, 13 Dec 2017 13:59:18 +0000
(14:59 +0100)
If you're using Chrony or NTPD you don't want the busybox NTP server
as well. Make it's installation truly conditional.
Signed-off-by: Philip Prindeville <
[email protected]
>
Signed-off-by: Felix Fietkau <
[email protected]
> [simplify]
(cherry picked from commit
0b24850e97789818fadcbce4b8de4abc429fd9f2
)
package/utils/busybox/Makefile
patch
|
blob
|
history
diff --git
a/package/utils/busybox/Makefile
b/package/utils/busybox/Makefile
index 40bddd6b58195828951d1e48c12848f4fbfc1430..6463dc0184f1f857c27edfa26ffdd5b70d0bfe23 100644
(file)
--- a/
package/utils/busybox/Makefile
+++ b/
package/utils/busybox/Makefile
@@
-118,9
+118,13
@@
endef
define Package/busybox/install
$(INSTALL_DIR) $(1)/etc/init.d
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+ifneq ($(CONFIG_BUSYBOX_CONFIG_CROND),)
$(INSTALL_BIN) ./files/cron $(1)/etc/init.d/cron
+endif
+ifneq ($(CONFIG_BUSYBOX_CONFIG_NTPD),)
$(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd
$(INSTALL_BIN) ./files/ntpd-hotplug $(1)/usr/sbin/ntpd-hotplug
+endif
-rm -rf $(1)/lib64
endef