diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-06-11 16:26:11 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:57:52 +0100 |
| commit | 0dbe539403fc0da3c3d0b1a6636bc7c9d0e19484 (patch) | |
| tree | a3f1740bb9cf300948b747feff51724968a569c2 /meta | |
| parent | 7cb4ca779a01c3ce935682373fe2a5b02abc91a2 (diff) | |
| download | openembedded-core-contrib-0dbe539403fc0da3c3d0b1a6636bc7c9d0e19484.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb | 1 |
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 00000000000..ed942504014 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/fix-git-version-gen.patch @@ -0,0 +1,24 @@ +git-version-gen gets confused if a tarball is being built inside a git directory +(ie your build directory is a subdirectory of a poky clone), and ends up calling +the release 6.0-dirty. Add a shortcut exit so if a tarball is detected it +doesn't attempt to look at the git status. + +Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=90936) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/git-version-gen b/git-version-gen +index 7546884..079b93e 100755 +--- a/git-version-gen ++++ b/git-version-gen +@@ -84,7 +84,10 @@ then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output +- [0-9]*) ;; ++ [0-9]*) ++ echo "$v" | tr -d '\012' ++ exit 0 ++ ;; + *) v= ;; + esac + test -z "$v" \ diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb index 10969bd0c6f..31e90963891 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 \ file://0001-padsp-Make-it-compile-on-musl.patch \ file://0001-client-conf-Add-allow-autospawn-for-root.patch \ file://0001-conf-parser-add-support-for-.d-directories.patch \ + file://fix-git-version-gen.patch \ file://volatiles.04_pulse \ " SRC_URI[md5sum] = "b691e83b7434c678dffacfa3a027750e" |