Re: [PATCH] busybox: Enable FEATURE_MOUNT_NFS and use libtirpc

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1929 bytes --]

On Wed, May 30, 2018 at 10:39:16AM -0700, Andre McCurdy wrote:
>  On Thu, May 10, 2018 at 12:26 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > On 5/10/18 12:16 PM, Martin Jansa wrote:
> >>>
> >>> On second thought, this probably should be enabled using a config
> >>> fragment, since its not gonna link in another library it may not be
> >>> common case to justify for a default config.
> >>
> >> That's true, I've enabled CONFIG_FEATURE_MOUNT_NFS mostly to show how to
> >> reproduce the issue.
> >>
> >> If there isn't interest to enable this by default, I'm fine with keeping
> >> this
> >> locally (to enable it only with our defconfig changes which enable it).
> >
> > I think keeping it as a nfsmount.cfg which then can be applied via a
> > bbappend could be a good option. May be adding a PACKAGECONFIG to control
> > the -I flag and libtirpc dependency would be nice too
> 
> According to the busybox config help, CONFIG_FEATURE_MOUNT_NFS is only
> required for kernel versions before 2.6.23. Do we officially support
> kernels that old in oe-core? Or should this be in a .bbappend etc in
> separate layer?

OK, I agree that this should be kept in separate layer. If anyone needs
it, the working version (with tirpc added in CONFIG_EXTRA_LDLIBS) is
attached.

> //config:config FEATURE_MOUNT_NFS
> //config:    bool "Support mounting NFS file systems on Linux < 2.6.23"
> //config:    default n
> //config:    depends on MOUNT
> //config:    select FEATURE_SYSLOG
> //config:    help
> //config:    Enable mounting of NFS file systems on Linux kernels prior
> //config:    to version 2.6.23. Note that in this case mounting of NFS
> //config:    over IPv6 will not be possible.
> //config:
> //config:    Note that this option links in RPC support from libc,
> //config:    which is rather large (~10 kbytes on uclibc).

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #1.2: 0001-busybox-Enable-FEATURE_MOUNT_NFS-and-use-libtirpc.patch --]
[-- Type: text/x-diff, Size: 2680 bytes --]

From 3316407c73058173bcfa1b9fabcad4592d23cbfc Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 10 May 2018 12:08:58 +0000
Subject: [PATCH] busybox: Enable FEATURE_MOUNT_NFS and use libtirpc

* We dropped in-tree obsoleted rpc from glibc and now busybox builds
  which had CONFIG_FEATURE_MOUNT_NFS enabled were failing with:
  | util-linux/mount.c:252:11: fatal error: rpc/rpc.h: No such file or directory
  |  # include <rpc/rpc.h>
  |            ^~~~~~~~~~~
  | compilation terminated.
  | make[1]: *** [util-linux/mount.o] Error 1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/busybox/busybox.inc       | 6 +++---
 meta/recipes-core/busybox/busybox/defconfig | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index d1675c37aa..2db19ed317 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into
 HOMEPAGE = "http://www.busybox.net"
 BUGTRACKER = "https://bugs.busybox.net/"
 
-DEPENDS += "kern-tools-native"
+DEPENDS += "kern-tools-native libtirpc"
 
 # bzip2 applet in busybox is based on lightly-modified bzip2 source
 # the GPL is version 2 only
@@ -15,8 +15,8 @@ SECTION = "base"
 # Whether to split the suid apps into a seperate binary
 BUSYBOX_SPLIT_SUID ?= "1"
 
-export EXTRA_CFLAGS = "${CFLAGS}"
-export EXTRA_LDFLAGS = "${LDFLAGS}"
+export EXTRA_CFLAGS = "${CFLAGS} -I${STAGING_INCDIR}/tirpc"
+export EXTRA_LDFLAGS = "${LDFLAGS} -ltirpc"
 
 EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y HOSTCC='${BUILD_CC}' HOSTCPP='${BUILD_CPP}'"
 
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index fbb5fd852c..2e920277b7 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -51,7 +51,7 @@ CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
+CONFIG_EXTRA_LDLIBS="tirpc"
 
 #
 # Installation Options ("make install" behavior)
@@ -638,7 +638,7 @@ CONFIG_MOUNT=y
 # CONFIG_FEATURE_MOUNT_VERBOSE is not set
 # CONFIG_FEATURE_MOUNT_HELPERS is not set
 # CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_NFS=y
 # CONFIG_FEATURE_MOUNT_CIFS is not set
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
-- 
2.17.1


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]