Jelajahi Sumber

When both busybox and coreutils and/or util-linux are selected,
make certain that it is coreutils and/or util-linux that actually
gets their utilities installed.
-Erik

Eric Andersen 20 tahun lalu
induk
melakukan
b5a211c68e
2 mengubah file dengan 13 tambahan dan 0 penghapusan
  1. 6 0
      package/coreutils/coreutils.mk
  2. 7 0
      package/util-linux/util-linux.mk

+ 6 - 0
package/coreutils/coreutils.mk

@@ -73,7 +73,13 @@ $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY)
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
+#If both coreutils and busybox are selected, make certain coreutils
+#wins the fight over who gets to have their utils actually installed
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+coreutils: uclibc busybox $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
+else
 coreutils: uclibc $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
+endif
 
 coreutils-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(COREUTILS_DIR) uninstall

+ 7 - 0
package/util-linux/util-linux.mk

@@ -60,7 +60,14 @@ $(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/share/info \
 		$(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/share/doc
 
+#If both util-linux and busybox are selected, make certain util-linux
+#wins the fight over who gets to have their utils actually installed
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+util-linux: uclibc busybox $(UTIL-LINUX_TARGET_BINARY)
+else
 util-linux: uclibc $(UTIL-LINUX_TARGET_BINARY)
+endif
+
 
 util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE)