summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-06-11 16:26:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:19 +0100
commitf268480d3185b968843c50e3ddeede79c7711a8d (patch)
tree263fa86f2d5e8a3c68ce222d395c17073e51fcb9 /meta
parent19d61b9db328ca4d64c56270055c5b0ed4935906 (diff)
downloadpoky-f268480d3185b968843c50e3ddeede79c7711a8d.tar.gz
pulseaudio: fix version when building inside a dirty git checkout
If the build directory is a subdirectory of a git clone, and that git clone is dirty, PulseAudio will build thinking it's version is 6.0-dirty. Fix git-version-gen so it doesn't do the git checks for tarball builds. (From OE-Core rev: 0dbe539403fc0da3c3d0b1a6636bc7c9d0e19484) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch24
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb1
2 files changed, 25 insertions, 0 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
new file mode 100644
index 0000000000..ed94250401
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch
@@ -0,0 +1,24 @@
1git-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
3the release 6.0-dirty. Add a shortcut exit so if a tarball is detected it
4doesn't attempt to look at the git status.
5
6Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=90936)
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9diff --git a/git-version-gen b/git-version-gen
10index 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" \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb
index 10969bd0c6..31e9096389 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb
@@ -4,6 +4,7 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
4 file://0001-padsp-Make-it-compile-on-musl.patch \ 4 file://0001-padsp-Make-it-compile-on-musl.patch \
5 file://0001-client-conf-Add-allow-autospawn-for-root.patch \ 5 file://0001-client-conf-Add-allow-autospawn-for-root.patch \
6 file://0001-conf-parser-add-support-for-.d-directories.patch \ 6 file://0001-conf-parser-add-support-for-.d-directories.patch \
7 file://fix-git-version-gen.patch \
7 file://volatiles.04_pulse \ 8 file://volatiles.04_pulse \
8" 9"
9SRC_URI[md5sum] = "b691e83b7434c678dffacfa3a027750e" 10SRC_URI[md5sum] = "b691e83b7434c678dffacfa3a027750e"