[Buildroot] [PATCHv2 1/3] ltp-testsuite: disable tirpc tests using authdes_create

[Buildroot] [PATCHv2 1/3] ltp-testsuite: disable tirpc tests using authdes_create

[Thomas De Schampheleire]

From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

In buildroot, libtirpc is patched to remove authdes_create functions.
As a result, compilation of tests that use these functions, fails.

A previous fix was implemented in commit
8f1c4c49a2ab0fc9e6cf73370f4483e253e5ac2d, but simply disabled linking with
libtirpc entirely. This broke usage of ltp-testsuite on targets where the
toolchain does not have RPC support and libtirpc is mandatory.

Instead, disable only the problematic tests, leaving ltp-testsuite usable
with libtirpc.

Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 ...isable-tirpc_auth_authdes_seccreate-tests.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/ltp-testsuite/0002-rpc-tirpc-disable-tirpc_auth_authdes_seccreate-tests.patch

v2: reorder patches only

diff --git a/package/ltp-testsuite/0002-rpc-tirpc-disable-tirpc_auth_authdes_seccreate-tests.patch b/package/ltp-testsuite/0002-rpc-tirpc-disable-tirpc_auth_authdes_seccreate-tests.patch
new file mode 100644
index 0000000..6ab9d13
--- /dev/null
+++ b/package/ltp-testsuite/0002-rpc-tirpc-disable-tirpc_auth_authdes_seccreate-tests.patch
@@ -0,0 +1,30 @@
+rpc-tirpc: disable tirpc_auth_authdes_seccreate tests
+
+Due to Buildroot patch 0007-Disable-DES-authentification-support.patch on
+libtirpc, this library is built without method authdes_create. Any code
+that uses this library, like the rpc-tirpc testsuite, thus fails to link.
+
+In the context of Buildroot, instead of disabling ltp-testsuite entirely,
+just disable the problematic tests.
+
+Upstream-status: not applicable
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+---
+ testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile
+index 45bc8a6..6c4089e 100644
+--- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile
++++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile
+@@ -19,4 +19,7 @@
+ top_srcdir		?= ../../../../../../..
+ 
+ include	$(top_srcdir)/include/mk/env_pre.mk
++
++FILTER_OUT_DIRS += tirpc_auth_authdes_seccreate
++
+ include $(top_srcdir)/include/mk/generic_trunk_target.mk
+-- 
+1.9.5
+
-- 
1.9.5

[Buildroot] [PATCHv2 2/3] Revert "ltp-testsuite: don't link with libtirpc"

[Thomas De Schampheleire]

From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

This reverts commit 8f1c4c49a2ab0fc9e6cf73370f4483e253e5ac2d in favor of an
alternative solution in a subsequent patch.

Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 package/ltp-testsuite/ltp-testsuite.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

v2: reorder patches only

diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 78dc9f4..da36636 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -24,11 +24,18 @@ endif
 # support.
 LTP_TESTSUITE_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))
 LTP_TESTSUITE_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))
+LTP_TESTSUITE_LIBS =
+
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+LTP_TESTSUITE_DEPENDENCIES += libtirpc host-pkgconf
+LTP_TESTSUITE_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
+LTP_TESTSUITE_LIBS += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`"
+endif
 
 LTP_TESTSUITE_CONF_ENV += \
-	ac_cv_header_tirpc_netconfig_h=no \
 	CFLAGS="$(LTP_TESTSUITE_CFLAGS)" \
 	CPPFLAGS="$(LTP_TESTSUITE_CPPFLAGS)" \
+	LIBS="$(LTP_TESTSUITE_LIBS)" \
 	SYSROOT="$(STAGING_DIR)"
 
 $(eval $(autotools-package))
-- 
1.9.5

[Buildroot] [PATCHv2 3/3] Revert "ltp-testsuite: don't select libtirpc"

[Thomas De Schampheleire]

From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

This reverts commit fc366046429471228c74be7f09d0645256649fd3 in favor of an
alternative solution in a subsequent patch.

Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 package/ltp-testsuite/Config.in | 1 +
 1 file changed, 1 insertion(+)

v2: reorder patches only

diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index bd540f2..8475902 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_TOOLCHAIN_USES_MUSL
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	# does not build, cachectl.h issue
 	depends on !BR2_nios2
 	help
-- 
1.9.5

[Buildroot] [PATCHv2 1/3] ltp-testsuite: disable tirpc tests using authdes_create

[Thomas Petazzoni]

Dear Thomas De Schampheleire,

On Fri, 11 Dec 2015 09:51:40 +0100, Thomas De Schampheleire wrote:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> 
> In buildroot, libtirpc is patched to remove authdes_create functions.
> As a result, compilation of tests that use these functions, fails.
> 
> A previous fix was implemented in commit
> 8f1c4c49a2ab0fc9e6cf73370f4483e253e5ac2d, but simply disabled linking with
> libtirpc entirely. This broke usage of ltp-testsuite on targets where the
> toolchain does not have RPC support and libtirpc is mandatory.
> 
> Instead, disable only the problematic tests, leaving ltp-testsuite usable
> with libtirpc.
> 
> Cc: Baruch Siach <baruch@tkos.co.il>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> ---
>  ...isable-tirpc_auth_authdes_seccreate-tests.patch | 30 ++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
>  create mode 100644 package/ltp-testsuite/0002-rpc-tirpc-disable-tirpc_auth_authdes_seccreate-tests.patch

All three patches applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com