summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Brodkin <Alexey.Brodkin@synopsys.com>2015-03-11 11:11:11 +0300
committerPeter Korsgaard <peter@korsgaard.com>2015-03-11 17:10:55 +0100
commitf0fb30bc567c91169c5a66f055db731a3c00c7ab (patch)
treea9094900a5c0ce6b782e681dac89bf79cdf86f8d
parent0df6ad5ddb5036dcc7400d79e83a803e1cac9908 (diff)
downloadbuildroot-f0fb30bc567c91169c5a66f055db731a3c00c7ab.tar.gz
buildroot-f0fb30bc567c91169c5a66f055db731a3c00c7ab.zip
busybox: remove actions that depend on removed netkit* packages
Both "netkitbase" and "netkittelnet" packages were removed by this commit: http://git.buildroot.net/buildroot/commit/?id=560fe85bf7fb81956e80848c8bb28d7a6d00a2a2 Now we may safely remove reminders in busybox.mk that depend on mentioned packages that are no longer in Buildroot. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/busybox/busybox.mk16
1 files changed, 0 insertions, 16 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 61f6a168e6..a3ac7e7b60 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -124,20 +124,6 @@ define BUSYBOX_PREFER_STATIC
endef
endif
-# Disable usage of inetd if netkit-base package is selected
-ifeq ($(BR2_PACKAGE_NETKITBASE),y)
-define BUSYBOX_NETKITBASE
- $(call KCONFIG_DISABLE_OPT,CONFIG_INETD,$(BUSYBOX_BUILD_CONFIG))
-endef
-endif
-
-# Disable usage of telnetd if netkit-telnetd package is selected
-ifeq ($(BR2_PACKAGE_NETKITTELNET),y)
-define BUSYBOX_NETKITTELNET
- $(call KCONFIG_DISABLE_OPT,CONFIG_TELNETD,$(BUSYBOX_BUILD_CONFIG))
-endef
-endif
-
# Disable shadow passwords support if unsupported by the C library
ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),)
define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
@@ -193,8 +179,6 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
$(BUSYBOX_PREFER_STATIC)
$(BUSYBOX_SET_MDEV)
$(BUSYBOX_SET_CRYPT_SHA)
- $(BUSYBOX_NETKITBASE)
- $(BUSYBOX_NETKITTELNET)
$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
$(BUSYBOX_SET_INIT)
$(BUSYBOX_SET_WATCHDOG)
OpenPOWER on IntegriCloud