4b97cd2fb4
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
53 lines
1.2 KiB
Diff
53 lines
1.2 KiB
Diff
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.
|
|
|
|
--- a/core-shim.c
|
|
+++ b/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
|
|
--- a/stress-ramfs.c
|
|
+++ b/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 stress_help_t help[] = {
|
|
{ NULL, "ramfs N", "start N workers exercising ramfs mounts" },
|
|
{ NULL, "ramfs-ops N", "stop after N bogo ramfs mount operations" },
|