Skip to contentSkip to conversation

package/ltp-testsuite: enable build under musl

PATCH New Petr Vorel 2 participants 2 messages Oct 17, 2019 – Oct 21, 2019

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v3 1/1 package/ltp-testsuite: enable build under musl

This requires to remove a lot of broken code until it's fixed in upstream. Added 2 patches from upcoming release.

---
Changes v2->v3:
* improve commit message (sorry for noise)

Changes v1->v2:
* refresh patches
* update requirements comment in Config.in (Thomas)
* improve code removing unsupported bits (Thomas)

Kind regards,
Petr

 ...ine-_GNU_SOURCE-to-fix-build-on-musl.patch | 27 ++++++++++
 ...x-missing-__kernel_fsid_t-definition.patch | 41 +++++++++++++++
 package/ltp-testsuite/Config.in               |  5 +-
 package/ltp-testsuite/ltp-testsuite.mk        | 50 ++++++++++++++++---
 4 files changed, 114 insertions(+), 9 deletions(-)
 create mode 100644 package/ltp-testsuite/0003-setxattr03-define-_GNU_SOURCE-to-fix-build-on-musl.patch
 create mode 100644 package/ltp-testsuite/0004-fanotify-Fix-missing-__kernel_fsid_t-definition.patch
package/ltp-testsuite/0003-setxattr03-define-_GNU_SOURCE-to-fix-build-on-musl.patch new file +27 -0
new file mode 100644
index 0000000000..6b76926a39
@@ -0,0 +1,27 @@
+From a712a3930d98336f4a0931ae06da691b7fa0ecd7 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <[email protected]>
+Date: Mon, 14 Oct 2019 13:02:55 +0200
+Subject: [PATCH] setxattr03: define _GNU_SOURCE to fix build on musl
+
+musl defines loff_t in <fcntl.h> and guard it under _GNU_SOURCE.
+
+Signed-off-by: Petr Vorel <[email protected]>
+[Upstream status: 3d2b9ef91f32a0a1794a8a05b825b18c6f956b0c]
+---
+ testcases/kernel/syscalls/setxattr/setxattr03.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/testcases/kernel/syscalls/setxattr/setxattr03.c b/testcases/kernel/syscalls/setxattr/setxattr03.c
+index bb511d5ba..58ee0f880 100644
+--- a/testcases/kernel/syscalls/setxattr/setxattr03.c
++++ b/testcases/kernel/syscalls/setxattr/setxattr03.c
+@@ -13,6 +13,7 @@
+  *    -1 and set errno to EPERM
+  */
+
++#define _GNU_SOURCE
+ #include "config.h"
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+--
+2.23.0
package/ltp-testsuite/0004-fanotify-Fix-missing-__kernel_fsid_t-definition.patch new file +41 -0

41 lines not on this page · raw message

package/ltp-testsuite/Config.in +2 -3
index 500a8c2688..32e1b6ad76 100644
@@ -12,7 +12,6 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	bool "ltp-testsuite"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
@@ -21,7 +20,7 @@ config BR2_PACKAGE_LTP_TESTSUITE
 
 	  http://linux-test-project.github.io
 
-comment "ltp-testsuite needs a glibc or uClibc toolchain w/ NPTL"
+comment "ltp-testsuite needs a toolchain w/ NPTL"
 	depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_TOOLCHAIN_USES_MUSL
+	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
package/ltp-testsuite/ltp-testsuite.mk +44 -6

59 lines not on this page · raw message

Signature · 1 line
2.23.0
#1 lore raw

PATCH v3 1/1 package/ltp-testsuite: enable build under musl

Quoted 7 lines · On Fri, 18 Oct 2019 00:18:27 +0200 Petr Vorel <[email protected]> wrote:

This requires to remove a lot of broken code until it's fixed in upstream. Added 2 patches from upcoming release.

---
Changes v2->v3:
* improve commit message (sorry for noise)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com