From 58ef6b3ca7e0c195e7ef0d9523661aa333cf88b6 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Mon, 7 May 2007 04:04:34 +0000 Subject: If any of the netkit packages were selected, we disable their counterparts in Busybox and warn the user. --- package/busybox/busybox.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index c939b5f1f..16e3ee835 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -77,6 +77,16 @@ endif ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y) # force mdev on $(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 yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig -- cgit v1.2.3