diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-10-18 13:14:42 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-10-18 15:04:23 +0200 |
| commit | 6161049aeda617a3ed93253c1b0122aecf90d4c7 (patch) | |
| tree | f060990707d538b72944882081463c66e735b979 | |
| parent | ea729ab3e5936011e91d3ba636bf6e0a0bf51528 (diff) | |
| download | buildroot-novena-6161049aeda617a3ed93253c1b0122aecf90d4c7.tar.gz buildroot-novena-6161049aeda617a3ed93253c1b0122aecf90d4c7.zip | |
busybox: only install S01logging / S10mdev if not present in fs skeleton
To allow custom syslogd / mdev configutations.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/busybox/busybox.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0751f6a2a..c95190d2a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -31,7 +31,9 @@ endif # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y) define BUSYBOX_INSTALL_MDEV_SCRIPT - install -m 0755 package/busybox/S10mdev $(TARGET_DIR)/etc/init.d + [ -f $(TARGET_DIR)/etc/init.d/S10mdev ] || + install -D -m 0755 package/busybox/S10mdev \ + $(TARGET_DIR)/etc/init.d/S10mdev endef define BUSYBOX_INSTALL_MDEV_CONF [ -f $(TARGET_DIR)/etc/mdev.conf ] || \ @@ -129,8 +131,9 @@ endif define BUSYBOX_INSTALL_LOGGING_SCRIPT if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \ - $(INSTALL) -m 0755 -D package/busybox/S01logging \ - $(TARGET_DIR)/etc/init.d/S01logging; \ + [ -f $(TARGET_DIR)/etc/init.d/S01logging ] || \ + $(INSTALL) -m 0755 -D package/busybox/S01logging \ + $(TARGET_DIR)/etc/init.d/S01logging; \ else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi endef |