diff options
Diffstat (limited to 'package/utils/busybox')
| -rw-r--r-- | package/utils/busybox/Config.in | 5 | ||||
| -rw-r--r-- | package/utils/busybox/Makefile | 7 | ||||
| -rw-r--r-- | package/utils/busybox/config/networking/Config.in | 7 | ||||
| -rw-r--r-- | package/utils/busybox/config/util-linux/Config.in | 14 |
4 files changed, 2 insertions, 31 deletions
diff --git a/package/utils/busybox/Config.in b/package/utils/busybox/Config.in index 917e714f6c..4d87e18278 100644 --- a/package/utils/busybox/Config.in +++ b/package/utils/busybox/Config.in @@ -18,9 +18,4 @@ config BUSYBOX_CUSTOM source "config/Config.in" endif -config BUSYBOX_USE_LIBRPC - bool - default y if BUSYBOX_CUSTOM && BUSYBOX_CONFIG_FEATURE_HAVE_RPC - default y if !BUSYBOX_CUSTOM && BUSYBOX_DEFAULT_FEATURE_HAVE_RPC - endif diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 3969bbeb18..0eaec19938 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://www.busybox.net/downloads \ http://sources.buildroot.net PKG_HASH:=9553da068c0a30b1b8b72479908c1ba58672e2be7b535363a88de5e0f7bc04ce -PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc BUSYBOX_CONFIG_PAM:libpam +PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam PKG_BUILD_PARALLEL:=1 PKG_CHECK_FORMAT_SECURITY:=0 @@ -43,7 +43,7 @@ define Package/busybox MAINTAINER:=Felix Fietkau <nbd@nbd.name> TITLE:=Core utilities for embedded Linux URL:=http://busybox.net/ - DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter + DEPENDS:=+BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter MENU:=1 ALTERNATIVES:=\ $(call BUSYBOX_IF_ENABLED,FIND, 100:/usr/bin/find:/bin/busybox) \ @@ -82,9 +82,6 @@ LDLIBS:=m crypt endif LDLIBS += $(call BUSYBOX_IF_ENABLED,PAM,pam pam_misc pthread) -ifdef CONFIG_BUSYBOX_USE_LIBRPC - LDLIBS += rpc -endif ifeq ($(CONFIG_USE_GLIBC),y) LDLIBS += $(call BUSYBOX_IF_ENABLED,NSLOOKUP_OPENWRT,resolv) endif diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in index 2071fd015e..97a1bfbce5 100644 --- a/package/utils/busybox/config/networking/Config.in +++ b/package/utils/busybox/config/networking/Config.in @@ -455,13 +455,6 @@ config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN help Familiar character generator internal inetd service -config BUSYBOX_CONFIG_FEATURE_INETD_RPC - bool "Support RPC services" - default BUSYBOX_DEFAULT_FEATURE_INETD_RPC # very rarely used, and needs Sun RPC support in libc - depends on BUSYBOX_CONFIG_INETD - select BUSYBOX_CONFIG_FEATURE_HAVE_RPC - help - Support Sun-RPC based services config BUSYBOX_CONFIG_IP bool "ip" default BUSYBOX_DEFAULT_IP diff --git a/package/utils/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in index 74a49d00c2..9ce25e00ef 100644 --- a/package/utils/busybox/config/util-linux/Config.in +++ b/package/utils/busybox/config/util-linux/Config.in @@ -627,20 +627,6 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL name. This feature utilizes the same functionality as blkid/findfs. This also enables label or uuid support for swapon. -config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS - bool "Support mounting NFS file systems on Linux < 2.6.23" - default BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS - depends on BUSYBOX_CONFIG_MOUNT - select BUSYBOX_CONFIG_FEATURE_HAVE_RPC - select BUSYBOX_CONFIG_FEATURE_SYSLOG - help - Enable mounting of NFS file systems on Linux kernels prior - to version 2.6.23. Note that in this case mounting of NFS - over IPv6 will not be possible. - - Note that this option links in RPC support from libc, - which is rather large (~10 kbytes on uclibc). - config BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS bool "Support mounting CIFS/SMB file systems" default BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS |