dd9d4a1979
```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
```
14 lines
298 B
Diff
14 lines
298 B
Diff
Reverts 1fe8e0f074c77aa41aaa579345a9e675acbebfa9
|
|
|
|
--- a/include/uapi/linux/if_tunnel.h
|
|
+++ b/include/uapi/linux/if_tunnel.h
|
|
@@ -2,9 +2,6 @@
|
|
#define _UAPI_IF_TUNNEL_H_
|
|
|
|
#include <linux/types.h>
|
|
-#include <linux/if.h>
|
|
-#include <linux/ip.h>
|
|
-#include <linux/in6.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
|