Skip to contentSkip to conversation

busybox: remove actions that depend on removed netkit* packages

PATCH New Alexey Brodkin 2 participants 2 messages Mar 11, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/busybox/busybox.mk | 16 ----------------
 1 file changed, 16 deletions(-)
package/busybox/busybox.mk +0 -16
index 61f6a16..a3ac7e7 100644
@@ -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)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 busybox: remove actions that depend on removed netkit* packages

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Alexey" == Alexey Brodkin <[email protected]> writes:

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.

Committed, thanks.

Signature · 2 lines
Venlig hilsen,
Peter Korsgaard