* [PR PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls)
@ 2019-10-23 17:04 voidlinux-github
2019-10-23 17:21 ` voidlinux-github
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-23 17:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
There is a new pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages stress-ng
https://github.com/void-linux/void-packages/pull/15743
stress-ng: fix build on musl (disable linux5.2 syscalls)
A patch file from https://github.com/void-linux/void-packages/pull/15743.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stress-ng-15743.patch --]
[-- Type: text/x-diff, Size: 3395 bytes --]
From 48c80af9ed84df25941adca85beb52dd0a3303e2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Oct 2019 19:02:05 +0200
Subject: [PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls)
[ci skip]
---
.../patches/disable-linux52-syscalls.patch | 73 +++++++++++++++++++
srcpkgs/stress-ng/template | 4 -
2 files changed, 73 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
diff --git a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
new file mode 100644
index 00000000000..caceb05f5e5
--- /dev/null
+++ b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
@@ -0,0 +1,73 @@
+This disables usage of new Linux 5.2 system calls.
+
+This is necessary as musl has picked up the syscall numbers for these in its
+most recent release, but our kernel-libc-headers is still 4.19, which breaks
+build.
+
+Glibc is fine because it uses syscall numbers from these kernel headers
+instead of defining its own.
+
+--- core-shim.c
++++ core-shim.c
+@@ -1217,7 +1217,7 @@ int shim_pidfd_send_signal(
+ */
+ int shim_fsopen(const char *fsname, unsigned int flags)
+ {
+-#if defined(__NR_fsopen)
++#if 0
+ return syscall(__NR_fsopen, fsname, flags);
+ #else
+ return shim_enosys(0, fsname, flags);
+@@ -1226,7 +1226,7 @@ int shim_fsopen(const char *fsname, unsigned int flags)
+
+ int shim_fsmount(int fd, unsigned int flags, unsigned int ms_flags)
+ {
+-#if defined(__NR_fsmount)
++#if 0
+ return syscall(__NR_fsmount, fd, flags, ms_flags);
+ #else
+ return shim_enosys(0, fd, flags, ms_flags);
+@@ -1240,7 +1240,7 @@ int shim_fsconfig(
+ const void *value,
+ int aux)
+ {
+-#if defined(__NR_fsconfig)
++#if 0
+ return syscall(__NR_fsconfig, fd, cmd, key, value, aux);
+ #else
+ return shim_enosys(0, fd, cmd, key, value, aux);
+@@ -1254,7 +1254,7 @@ int shim_move_mount(
+ const char *to_pathname,
+ unsigned int flags)
+ {
+-#if defined(__NR_move_mount)
++#if 0
+ return syscall(__NR_move_mount, from_dfd, from_pathname,
+ to_dfd, to_pathname, flags);
+ #else
+--- stress-ramfs.c
++++ stress-ramfs.c
+@@ -170,10 +170,7 @@ static int stress_ramfs_child(const args_t *args)
+ do {
+ int rc;
+ char opt[32];
+-#if defined(__NR_fsopen) && \
+- defined(__NR_fsmount) && \
+- defined(__NR_fsconfig) && \
+- defined(__NR_move_mount)
++#if 0
+ int fd, mfd;
+ #endif
+
+@@ -188,10 +185,7 @@ static int stress_ramfs_child(const args_t *args)
+ }
+ stress_ramfs_umount(args, realpathname);
+
+-#if defined(__NR_fsopen) && \
+- defined(__NR_fsmount) && \
+- defined(__NR_fsconfig) && \
+- defined(__NR_move_mount)
++#if 0
+ /*
+ * Use the new Linux 5.2 mount system calls
+ */
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 29b3c9d65af..512b379be63 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -10,7 +10,3 @@ license="GPL-2.0-or-later"
homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
checksum=4addeaabcfcb709581cbc4c61182317b8d91bcf31f529bfa899d170facfd75ce
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21516/steps/shell_3/logs/stdio"
-esac
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: stress-ng: fix build on musl (disable linux5.2 syscalls)
2019-10-23 17:04 [PR PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls) voidlinux-github
@ 2019-10-23 17:21 ` voidlinux-github
2019-10-23 17:22 ` voidlinux-github
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-23 17:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/15743#issuecomment-545548988
Comment:
q66 for presidenr
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: stress-ng: fix build on musl (disable linux5.2 syscalls)
2019-10-23 17:04 [PR PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls) voidlinux-github
2019-10-23 17:21 ` voidlinux-github
@ 2019-10-23 17:22 ` voidlinux-github
2019-10-23 17:52 ` [PR PATCH] [Updated] " voidlinux-github
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-23 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/15743#issuecomment-545548988
Comment:
q66 for president
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] stress-ng: fix build on musl (disable linux5.2 syscalls)
2019-10-23 17:04 [PR PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls) voidlinux-github
2019-10-23 17:21 ` voidlinux-github
2019-10-23 17:22 ` voidlinux-github
@ 2019-10-23 17:52 ` voidlinux-github
2019-10-23 17:52 ` voidlinux-github
2019-10-23 19:07 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-23 17:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
There is an updated pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages stress-ng
https://github.com/void-linux/void-packages/pull/15743
stress-ng: fix build on musl (disable linux5.2 syscalls)
A patch file from https://github.com/void-linux/void-packages/pull/15743.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stress-ng-15743.patch --]
[-- Type: text/x-diff, Size: 2627 bytes --]
From 74e004da45c16de8da655e7270365619d6ca9f19 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Oct 2019 19:02:05 +0200
Subject: [PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls)
[ci skip]
---
.../patches/disable-linux52-syscalls.patch | 53 +++++++++++++++++++
srcpkgs/stress-ng/template | 4 --
2 files changed, 53 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
diff --git a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
new file mode 100644
index 00000000000..d6fab5f28db
--- /dev/null
+++ b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
@@ -0,0 +1,53 @@
+This disables usage of new Linux 5.2 system calls.
+
+This is necessary as musl has picked up the syscall numbers for these in its
+most recent release, but our kernel-libc-headers is still 4.19, which breaks
+build.
+
+Glibc is fine because it uses syscall numbers from these kernel headers
+instead of defining its own.
+
+--- core-shim.c
++++ core-shim.c
+@@ -24,6 +24,19 @@
+ */
+ #include "stress-ng.h"
+
++#ifdef __NR_fsopen
++#undef __NR_fsopen
++#endif
++#ifdef __NR_fsmount
++#undef __NR_fsmount
++#endif
++#ifdef __NR_fsconfig
++#undef __NR_fsconfig
++#endif
++#ifdef __NR_move_mount
++#undef __NR_move_mount
++#endif
++
+ /*
+ * Various shim abstraction wrappers around systems calls and
+ * GCC helper functions that may not be supported by some
+--- stress-ramfs.c
++++ stress-ramfs.c
+@@ -24,6 +24,19 @@
+ */
+ #include "stress-ng.h"
+
++#ifdef __NR_fsopen
++#undef __NR_fsopen
++#endif
++#ifdef __NR_fsmount
++#undef __NR_fsmount
++#endif
++#ifdef __NR_fsconfig
++#undef __NR_fsconfig
++#endif
++#ifdef __NR_move_mount
++#undef __NR_move_mount
++#endif
++
+ static const help_t help[] = {
+ { NULL, "ramfs N", "start N workers exercising ramfs mounts" },
+ { NULL, "ramfs-ops N", "stop after N bogo ramfs mount operations" },
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 29b3c9d65af..512b379be63 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -10,7 +10,3 @@ license="GPL-2.0-or-later"
homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
checksum=4addeaabcfcb709581cbc4c61182317b8d91bcf31f529bfa899d170facfd75ce
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21516/steps/shell_3/logs/stdio"
-esac
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] stress-ng: fix build on musl (disable linux5.2 syscalls)
2019-10-23 17:04 [PR PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls) voidlinux-github
` (2 preceding siblings ...)
2019-10-23 17:52 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-23 17:52 ` voidlinux-github
2019-10-23 19:07 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-23 17:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
There is an updated pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages stress-ng
https://github.com/void-linux/void-packages/pull/15743
stress-ng: fix build on musl (disable linux5.2 syscalls)
A patch file from https://github.com/void-linux/void-packages/pull/15743.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stress-ng-15743.patch --]
[-- Type: text/x-diff, Size: 2627 bytes --]
From 74e004da45c16de8da655e7270365619d6ca9f19 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Oct 2019 19:02:05 +0200
Subject: [PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls)
[ci skip]
---
.../patches/disable-linux52-syscalls.patch | 53 +++++++++++++++++++
srcpkgs/stress-ng/template | 4 --
2 files changed, 53 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
diff --git a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
new file mode 100644
index 00000000000..d6fab5f28db
--- /dev/null
+++ b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
@@ -0,0 +1,53 @@
+This disables usage of new Linux 5.2 system calls.
+
+This is necessary as musl has picked up the syscall numbers for these in its
+most recent release, but our kernel-libc-headers is still 4.19, which breaks
+build.
+
+Glibc is fine because it uses syscall numbers from these kernel headers
+instead of defining its own.
+
+--- core-shim.c
++++ core-shim.c
+@@ -24,6 +24,19 @@
+ */
+ #include "stress-ng.h"
+
++#ifdef __NR_fsopen
++#undef __NR_fsopen
++#endif
++#ifdef __NR_fsmount
++#undef __NR_fsmount
++#endif
++#ifdef __NR_fsconfig
++#undef __NR_fsconfig
++#endif
++#ifdef __NR_move_mount
++#undef __NR_move_mount
++#endif
++
+ /*
+ * Various shim abstraction wrappers around systems calls and
+ * GCC helper functions that may not be supported by some
+--- stress-ramfs.c
++++ stress-ramfs.c
+@@ -24,6 +24,19 @@
+ */
+ #include "stress-ng.h"
+
++#ifdef __NR_fsopen
++#undef __NR_fsopen
++#endif
++#ifdef __NR_fsmount
++#undef __NR_fsmount
++#endif
++#ifdef __NR_fsconfig
++#undef __NR_fsconfig
++#endif
++#ifdef __NR_move_mount
++#undef __NR_move_mount
++#endif
++
+ static const help_t help[] = {
+ { NULL, "ramfs N", "start N workers exercising ramfs mounts" },
+ { NULL, "ramfs-ops N", "stop after N bogo ramfs mount operations" },
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 29b3c9d65af..512b379be63 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -10,7 +10,3 @@ license="GPL-2.0-or-later"
homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
checksum=4addeaabcfcb709581cbc4c61182317b8d91bcf31f529bfa899d170facfd75ce
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21516/steps/shell_3/logs/stdio"
-esac
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: stress-ng: fix build on musl (disable linux5.2 syscalls)
2019-10-23 17:04 [PR PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls) voidlinux-github
` (3 preceding siblings ...)
2019-10-23 17:52 ` voidlinux-github
@ 2019-10-23 19:07 ` voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-23 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
There's a merged pull request on the void-packages repository
stress-ng: fix build on musl (disable linux5.2 syscalls)
https://github.com/void-linux/void-packages/pull/15743
Description:
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-23 19:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-23 17:04 [PR PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls) voidlinux-github
2019-10-23 17:21 ` voidlinux-github
2019-10-23 17:22 ` voidlinux-github
2019-10-23 17:52 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-23 17:52 ` voidlinux-github
2019-10-23 19:07 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).