2
1
Эх сурвалжийг харах

If any of the netkit packages were selected, we disable their counterparts in Busybox and warn the user.

"Steven J. Hill" 18 жил өмнө
parent
commit
58ef6b3ca7

+ 10 - 0
package/busybox/busybox.mk

@@ -77,6 +77,16 @@ endif
 ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y)
 ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y)
 	# force mdev on
 	# force mdev on
 	$(SED) "s/^.*CONFIG_MDEV.*/CONFIG_MDEV=y/" $(BUSYBOX_DIR)/.config
 	$(SED) "s/^.*CONFIG_MDEV.*/CONFIG_MDEV=y/" $(BUSYBOX_DIR)/.config
+endif
+ifeq ($(BR2_PACKAGE_NETKITBASE),y)
+	# disable usage of inetd if netkit-base package is selected
+	$(SED) "s/^.*CONFIG_INETD.*/CONFIG_INETD=n/;" $(BUSYBOX_DIR)/.config
+	@echo "WARNING!! CONFIG_INETD option disabled!"
+endif
+ifeq ($(BR2_PACKAGE_NETKITTELNET),y)
+	# disable usage of telnetd if netkit-telnetd package is selected
+	$(SED) "s/^.*CONFIG_TELNETD.*/CONFIG_TELNETD=n/;" $(BUSYBOX_DIR)/.config
+	@echo "WARNING!! CONFIG_TELNETD option disabled!"
 endif
 endif
 	yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 	yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
 		CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig