diff options
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch deleted file mode 100644 index ed94250401..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | git-version-gen gets confused if a tarball is being built inside a git directory | ||
2 | (ie your build directory is a subdirectory of a poky clone), and ends up calling | ||
3 | the release 6.0-dirty. Add a shortcut exit so if a tarball is detected it | ||
4 | doesn't attempt to look at the git status. | ||
5 | |||
6 | Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=90936) | ||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | |||
9 | diff --git a/git-version-gen b/git-version-gen | ||
10 | index 7546884..079b93e 100755 | ||
11 | --- a/git-version-gen | ||
12 | +++ b/git-version-gen | ||
13 | @@ -84,7 +84,10 @@ then | ||
14 | v=`cat $tarball_version_file` || exit 1 | ||
15 | case $v in | ||
16 | *$nl*) v= ;; # reject multi-line output | ||
17 | - [0-9]*) ;; | ||
18 | + [0-9]*) | ||
19 | + echo "$v" | tr -d '\012' | ||
20 | + exit 0 | ||
21 | + ;; | ||
22 | *) v= ;; | ||
23 | esac | ||
24 | test -z "$v" \ | ||