diff mbox

[v13,8/8] skeleton: busybox individual apps no symlink

Message ID 1477423570-15694-8-git-send-email-bryce.ferguson@rockwellcollins.com
State Superseded
Headers show

Commit Message

Bryce Ferguson Oct. 25, 2016, 7:26 p.m. UTC 
From: Matt Weber <matthew.weber@rockwellcollins.com>

Ignore the creation of a symlink when individual binaries are
used.

Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>

---
Changes v12 -> v13:
  - No changes

Changes v11 -> v12:
  - Added a comment " allow busybox shell binary to remain when symlink are enabled"

Changes v1 -> v11:
  - No changes
---
 package/skeleton/skeleton.mk | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox

Patch

diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
index 1000161..40ac3b1 100644
--- a/package/skeleton/skeleton.mk
+++ b/package/skeleton/skeleton.mk
@@ -203,10 +203,14 @@  define SKELETON_BIN_SH
 	rm -f $(TARGET_DIR)/bin/sh
 endef
 else
+#Allow a busybox shell binary to remain and not get replaced by a symlink 
+#if individual binaries are enabled
+ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),)
 define SKELETON_BIN_SH
 	ln -sf $(SKELETON_TARGET_GENERIC_BIN_SH) $(TARGET_DIR)/bin/sh
 endef
 endif
+endif
 TARGET_FINALIZE_HOOKS += SKELETON_BIN_SH
 
 ifeq ($(BR2_TARGET_GENERIC_GETTY),y)