2fd8d4df94
```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
```
27 lines
821 B
Diff
27 lines
821 B
Diff
#src: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools?id=6642ae94227f7c3c91c1a58f00f99aeb9eb2393f
|
|
#upstream: no
|
|
|
|
From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Wed, 13 Jun 2018 23:48:04 -0700
|
|
Subject: [PATCH] Fix subdir objects configure error
|
|
|
|
Fix build on musl while here
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
open-vm-tools/configure.ac | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
|
|
index 71e684bb..b76a7966 100644
|
|
--- a/open-vm-tools/configure.ac
|
|
+++ b/open-vm-tools/configure.ac
|
|
@@ -303,6 +303,7 @@ AC_ARG_ENABLE(
|
|
[],
|
|
[enable_resolutionkms="auto"])
|
|
|
|
+AM_INIT_AUTOMAKE([subdir-objects])
|
|
AM_INIT_AUTOMAKE
|
|
|
|
###
|