mirror of
https://git.yoctoproject.org/poky
synced 2026-06-07 15:09:50 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
ce74971998
commit
5c185dd6f7
-55
@@ -1,55 +0,0 @@
|
||||
From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Tue, 21 Feb 2012 17:12:50 +0100
|
||||
Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
|
||||
repo
|
||||
|
||||
* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
|
||||
Upstream-Status: Inappropriate [OE-Specific]
|
||||
---
|
||||
build-aux/git-version-gen | 25 ++++++++++++++-----------
|
||||
1 files changed, 14 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
|
||||
index 0fa6faa..1d1f9d2 100755
|
||||
--- a/build-aux/git-version-gen
|
||||
+++ b/build-aux/git-version-gen
|
||||
@@ -126,18 +126,21 @@ fi
|
||||
|
||||
v=`echo "$v" |sed 's/^v//'`
|
||||
|
||||
-# Don't declare a version "dirty" merely because a time stamp has changed.
|
||||
-git status > /dev/null 2>&1
|
||||
+if test -d .git
|
||||
+then
|
||||
+ # Don't declare a version "dirty" merely because a time stamp has changed.
|
||||
+ git status > /dev/null 2>&1
|
||||
|
||||
-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
|
||||
-case "$dirty" in
|
||||
- '') ;;
|
||||
- *) # Append the suffix only if there isn't one already.
|
||||
- case $v in
|
||||
- *-dirty) ;;
|
||||
- *) v="$v-dirty" ;;
|
||||
- esac ;;
|
||||
-esac
|
||||
+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
|
||||
+ case "$dirty" in
|
||||
+ '') ;;
|
||||
+ *) # Append the suffix only if there isn't one already.
|
||||
+ case $v in
|
||||
+ *-dirty) ;;
|
||||
+ *) v="$v-dirty" ;;
|
||||
+ esac ;;
|
||||
+ esac
|
||||
+fi
|
||||
|
||||
# Omit the trailing newline, so that m4_esyscmd can use the result directly.
|
||||
echo "$v" | tr -d '\012'
|
||||
--
|
||||
1.7.8.4
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
|
||||
file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "d18d08ed030ce0e0f044f4c15c9df3c25b15beaf8700e45e43b736a6debf9707"
|
||||
@@ -0,0 +1,5 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch"
|
||||
|
||||
SRC_URI[sha256sum] = "28de33e28da24500cc1675c3a6ced1301c9a6a5e6dd06193569001f9ce9a5c53"
|
||||
Reference in New Issue
Block a user