49cb564d14
* par is kept at -Np0
```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
```
26 lines
530 B
Diff
26 lines
530 B
Diff
--- a/dutil.h
|
|
+++ b/dutil.h
|
|
@@ -28,6 +28,10 @@
|
|
#define __pure __attribute__ ((pure))
|
|
#endif
|
|
|
|
+#ifndef __always_inline
|
|
+#define __always_inline inline
|
|
+#endif
|
|
+
|
|
#define roundup(x,y) ((((x) + ((y) - 1)) / (y)) * (y))
|
|
|
|
static inline __attribute__((const)) bool is_power_of_2(unsigned long n)
|
|
--- a/lib/bpf/src/libbpf.c
|
|
+++ b/lib/bpf/src/libbpf.c
|
|
@@ -10,6 +10,10 @@
|
|
* Copyright (C) 2019 Isovalent, Inc.
|
|
*/
|
|
|
|
+#ifndef __always_inline
|
|
+#define __always_inline inline
|
|
+#endif
|
|
+
|
|
#ifndef _GNU_SOURCE
|
|
#define _GNU_SOURCE
|
|
#endif
|