Commit 8f579792 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

busybox: don't force FEATURE_NFS_MOUNT 



Instead of making the Busybox configuration more complicated by trying
to adjust it depending on whether RPC is available or not (which gets
complicated when RPC support can be provided by libtirpc), simplify
things by letting the user enable FEATURE_NFS_MOUNT or not depending
on whether RPC support is available or not.

Our default configuration do not enable FEATURE_NFS_MOUNT, so users
will not face any build problems by default. Only if they explicitly
enable FEATURE_NFS_MOUNT will they have to make sure that the
toolchain has RPC support, or that libtirpc is enabled (support for
this added in a followup patch).

[Peter: remove from CONFIGURE_CMDS as well]
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 6ee99c01

package/busybox/busybox.mk

+0 −12
Original line number Diff line number Diff line
@@ -81,17 +81,6 @@ define BUSYBOX_SET_IPV6 
endef

endif



# If RPC is enabled then enable nfs mounts

ifeq ($(BR2_INET_RPC),y)

define BUSYBOX_SET_RPC

	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))

endef

else

define BUSYBOX_SET_RPC

	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))

endef

endif



# If we're using static libs do the same for busybox

ifeq ($(BR2_PREFER_STATIC_LIB),y)

define BUSYBOX_PREFER_STATIC
@@ -170,7 +159,6 @@ BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG 
define BUSYBOX_CONFIGURE_CMDS

	$(BUSYBOX_SET_LARGEFILE)

	$(BUSYBOX_SET_IPV6)

	$(BUSYBOX_SET_RPC)

	$(BUSYBOX_PREFER_STATIC)

	$(BUSYBOX_SET_MDEV)

	$(BUSYBOX_NETKITBASE)