Message ID | ce9a6aa9dfc0c6dc3496b272670a8370b638aa21.1351964808.git.thomas.petazzoni@free-electrons.com |
---|---|
State | Accepted |
Headers | show |
On 11/03/12 18:47, Thomas Petazzoni wrote: > 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). > > Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com> Except for one comment below: Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > package/busybox/busybox.mk | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index 33f8633..306b46f 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -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 > - You forgot to remove the use of $(BUSYBOX_SET_RPC) Regards, Arnout > # If we're using static libs do the same for busybox > ifeq ($(BR2_PREFER_STATIC_LIB),y) > define BUSYBOX_PREFER_STATIC
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Instead of making the Busybox configuration more complicated by trying
Thomas> to adjust it depending on whether RPC is available or not (which gets
Thomas> complicated when RPC support can be provided by libtirpc), simplify
Thomas> things by letting the user enable FEATURE_NFS_MOUNT or not depending
Thomas> on whether RPC support is available or not.
Thomas> Our default configuration do not enable FEATURE_NFS_MOUNT, so users
Thomas> will not face any build problems by default. Only if they explicitly
Thomas> enable FEATURE_NFS_MOUNT will they have to make sure that the
Thomas> toolchain has RPC support, or that libtirpc is enabled (support for
Thomas> this added in a followup patch).
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/busybox/busybox.mk | 11 -----------
Thomas> 1 file changed, 11 deletions(-)
Thomas> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
Thomas> index 33f8633..306b46f 100644
Thomas> --- a/package/busybox/busybox.mk
Thomas> +++ b/package/busybox/busybox.mk
Thomas> @@ -81,17 +81,6 @@ define BUSYBOX_SET_IPV6
Thomas> endef
Thomas> endif
Thomas> -# If RPC is enabled then enable nfs mounts
Thomas> -ifeq ($(BR2_INET_RPC),y)
Thomas> -define BUSYBOX_SET_RPC
Thomas> - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))
Thomas> -endef
Thomas> -else
Thomas> -define BUSYBOX_SET_RPC
Thomas> - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))
Thomas> -endef
Thomas> -endif
You forgot to remove it from BUSYBOX_CONFIGURE_CMDS. I've fixed that and
committed, thanks.
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 33f8633..306b46f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -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
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). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/busybox/busybox.mk | 11 ----------- 1 file changed, 11 deletions(-)