diff options
| author | Simon Busch <morphis@gravedo.de> | 2012-06-21 08:18:46 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-06-21 20:03:55 +0200 |
| commit | 141b959e7b3bacd4340c8cf924fc08ee4addcad4 (patch) | |
| tree | 5ce5bed5d37996752854676ba6ede23091fc8ba9 /meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch | |
| parent | 6ba88f7ad957bf2f6fb4527f77697429f7d98a52 (diff) | |
| download | meta-openembedded-141b959e7b3bacd4340c8cf924fc08ee4addcad4.tar.gz | |
vala: update to 0.16.0 and restructure some stuff into vala.inc
* SRC_URI is now set initially to real upstream and not freesmartphone.org
* reset PR and INC_PR
* moved DEPENDS += "gtk+" to vala.inc
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch deleted file mode 100644 index e6c7941a77..0000000000 --- a/meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Tue, 21 Feb 2012 17:12:50 +0100 | ||
| 4 | Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git | ||
| 5 | repo | ||
| 6 | |||
| 7 | * for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty | ||
| 8 | |||
| 9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 10 | --- | ||
| 11 | build-aux/git-version-gen | 25 ++++++++++++++----------- | ||
| 12 | 1 files changed, 14 insertions(+), 11 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen | ||
| 15 | index 0fa6faa..1d1f9d2 100755 | ||
| 16 | --- a/build-aux/git-version-gen | ||
| 17 | +++ b/build-aux/git-version-gen | ||
| 18 | @@ -126,18 +126,21 @@ fi | ||
| 19 | |||
| 20 | v=`echo "$v" |sed 's/^v//'` | ||
| 21 | |||
| 22 | -# Don't declare a version "dirty" merely because a time stamp has changed. | ||
| 23 | -git status > /dev/null 2>&1 | ||
| 24 | +if test -d .git | ||
| 25 | +then | ||
| 26 | + # Don't declare a version "dirty" merely because a time stamp has changed. | ||
| 27 | + git status > /dev/null 2>&1 | ||
| 28 | |||
| 29 | -dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= | ||
| 30 | -case "$dirty" in | ||
| 31 | - '') ;; | ||
| 32 | - *) # Append the suffix only if there isn't one already. | ||
| 33 | - case $v in | ||
| 34 | - *-dirty) ;; | ||
| 35 | - *) v="$v-dirty" ;; | ||
| 36 | - esac ;; | ||
| 37 | -esac | ||
| 38 | + dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= | ||
| 39 | + case "$dirty" in | ||
| 40 | + '') ;; | ||
| 41 | + *) # Append the suffix only if there isn't one already. | ||
| 42 | + case $v in | ||
| 43 | + *-dirty) ;; | ||
| 44 | + *) v="$v-dirty" ;; | ||
| 45 | + esac ;; | ||
| 46 | + esac | ||
| 47 | +fi | ||
| 48 | |||
| 49 | # Omit the trailing newline, so that m4_esyscmd can use the result directly. | ||
| 50 | echo "$v" | tr -d '\012' | ||
| 51 | -- | ||
| 52 | 1.7.8.4 | ||
| 53 | |||
