From 94f6030170d3c80f064ea3ed5445217cd479e044 Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Mon, 13 Aug 2018 13:14:17 +0200 Subject: [PATCH] librpc: remove package * replaced with packages/libtirpc * remove busybox options rarely used/deprecated BUSYBOX_CONFIG_FEATURE_MOUNT_NFS BUSYBOX_CONFIG_FEATURE_INETD_RPC Signed-off-by: Andy Walsh --- package/libs/librpc/Makefile | 42 ------------------- package/utils/busybox/Config.in | 5 --- package/utils/busybox/Makefile | 7 +--- .../utils/busybox/config/networking/Config.in | 7 ---- .../utils/busybox/config/util-linux/Config.in | 14 ------- rules.mk | 2 - 6 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 package/libs/librpc/Makefile diff --git a/package/libs/librpc/Makefile b/package/libs/librpc/Makefile deleted file mode 100644 index d894dd3bdb..0000000000 --- a/package/libs/librpc/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=librpc -PKG_RELEASE=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=$(PROJECT_GIT)/project/librpc-uclibc.git -PKG_SOURCE_DATE:=2015-11-04 -PKG_SOURCE_VERSION:=a921e3ded051746f9f7cd5e5a312fb6771716aac -PKG_MIRROR_HASH:=22c8dc55e1c4e8e31635a37708a3ce622a6ca33ebd918a4321b0be6ffce89b21 -CMAKE_INSTALL:=1 -PKG_USE_MIPS16:=0 -PKG_BUILD_DEPENDS:=librpc/host - -PKG_LICENSE:=LGPL-2.1 -PKG_LICENSE_FILES:= - -PKG_MAINTAINER:=Felix Fietkau - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/librpc - SECTION:=libs - CATEGORY:=Libraries - TITLE:=uClibc RPC library -endef - -define Package/librpc/install - $(INSTALL_DIR) $(1)/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/librpc.so $(1)/lib/ -endef - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/include/rpc - $(INSTALL_DATA) $(HOST_BUILD_DIR)/rpc/types.h $(STAGING_DIR_HOSTPKG)/include/rpc - $(INSTALL_DATA) $(HOST_BUILD_DIR)/rpc/compat.h $(STAGING_DIR_HOSTPKG)/include/rpc -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,librpc)) 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 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 diff --git a/rules.mk b/rules.mk index e97b3f6491..80cb3d63f4 100644 --- a/rules.mk +++ b/rules.mk @@ -183,8 +183,6 @@ else LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.a)) LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-L$(TOOLCHAIN_DIR)/lib -lgcc_s,$(LIBGCC_A)) endif -LIBRPC=-lrpc -LIBRPC_DEPENDS=+librpc ifeq ($(CONFIG_ARCH_64BIT),y) LIB_SUFFIX:=64