summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-08-01 21:23:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-02 13:42:08 (GMT)
commit5c185dd6f7aec303a77e8379f4de66d28e4ca0c0 (patch)
treec8608397a6cfb14b162170dbc74373dabb8a386e
parentce749719989d679f58a7327b2d719b63b2f15753 (diff)
downloadpoky-5c185dd6f7aec303a77e8379f4de66d28e4ca0c0.tar.gz
vala: update 0.48.6 -> 0.48.7
Remove patch, as issue fixed upstream. (From OE-Core rev: 3e27b178a1cab60167812ff926e7b15a07af5811) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch55
-rw-r--r--meta/recipes-devtools/vala/vala_0.48.6.bb7
-rw-r--r--meta/recipes-devtools/vala/vala_0.48.7.bb5
3 files changed, 5 insertions, 62 deletions
diff --git a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
deleted file mode 100644
index ac9dc8c..0000000
--- a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 21 Feb 2012 17:12:50 +0100
4Subject: [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
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10
11Upstream-Status: Inappropriate [OE-Specific]
12---
13 build-aux/git-version-gen | 25 ++++++++++++++-----------
14 1 files changed, 14 insertions(+), 11 deletions(-)
15
16diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
17index 0fa6faa..1d1f9d2 100755
18--- a/build-aux/git-version-gen
19+++ b/build-aux/git-version-gen
20@@ -126,18 +126,21 @@ fi
21
22 v=`echo "$v" |sed 's/^v//'`
23
24-# Don't declare a version "dirty" merely because a time stamp has changed.
25-git status > /dev/null 2>&1
26+if test -d .git
27+then
28+ # Don't declare a version "dirty" merely because a time stamp has changed.
29+ git status > /dev/null 2>&1
30
31-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
32-case "$dirty" in
33- '') ;;
34- *) # Append the suffix only if there isn't one already.
35- case $v in
36- *-dirty) ;;
37- *) v="$v-dirty" ;;
38- esac ;;
39-esac
40+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
41+ case "$dirty" in
42+ '') ;;
43+ *) # Append the suffix only if there isn't one already.
44+ case $v in
45+ *-dirty) ;;
46+ *) v="$v-dirty" ;;
47+ esac ;;
48+ esac
49+fi
50
51 # Omit the trailing newline, so that m4_esyscmd can use the result directly.
52 echo "$v" | tr -d '\012'
53--
541.7.8.4
55
diff --git a/meta/recipes-devtools/vala/vala_0.48.6.bb b/meta/recipes-devtools/vala/vala_0.48.6.bb
deleted file mode 100644
index 9dace13..0000000
--- a/meta/recipes-devtools/vala/vala_0.48.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require ${BPN}.inc
2
3SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
4 file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
5 "
6
7SRC_URI[sha256sum] = "d18d08ed030ce0e0f044f4c15c9df3c25b15beaf8700e45e43b736a6debf9707"
diff --git a/meta/recipes-devtools/vala/vala_0.48.7.bb b/meta/recipes-devtools/vala/vala_0.48.7.bb
new file mode 100644
index 0000000..2e61db1
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala_0.48.7.bb
@@ -0,0 +1,5 @@
1require ${BPN}.inc
2
3SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch"
4
5SRC_URI[sha256sum] = "28de33e28da24500cc1675c3a6ced1301c9a6a5e6dd06193569001f9ce9a5c53"