diff options
author | Ross Burton <ross.burton@intel.com> | 2017-05-16 13:31:36 +0100 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2017-05-16 13:31:40 +0100 |
commit | 527547f7f462af1aca41866f25724daedff0dd66 (patch) | |
tree | 939af8e5b73b78ba481cd54bdb632beb2c98698b | |
parent | 4bdb99650a053f254ccd158a6d0c25c80e79f6ee (diff) | |
download | meta-mingw-527547f7f462af1aca41866f25724daedff0dd66.tar.gz |
libgpg-error: remove obsolete 1.26 bbappend
oe-core now has 1.27 which solves the problem this patch was for, so remove the
obsolete bbappend and patch.
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | recipes-support/libgpg-error/files/configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch | 46 | ||||
-rw-r--r-- | recipes-support/libgpg-error/libgpg-error_1.26.bbappend | 6 |
2 files changed, 0 insertions, 52 deletions
diff --git a/recipes-support/libgpg-error/files/configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch b/recipes-support/libgpg-error/files/configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch deleted file mode 100644 index ea5a102..0000000 --- a/recipes-support/libgpg-error/files/configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 274bb6fc22f8e0bfe521305d5e67eee268cabf7f Mon Sep 17 00:00:00 2001 | ||
2 | From: Nathan Rossi <nathan@nathanrossi.com> | ||
3 | Date: Fri, 30 Dec 2016 18:02:26 +1000 | ||
4 | Subject: [PATCH] configure.ac: Set 'mym4_revision' to 0 if not a git repo | ||
5 | |||
6 | --- | ||
7 | It is possible for the source to not be located in a git repository | ||
8 | (e.g. source is from a tarball). In which case the git repository | ||
9 | information is not available. This results in the mym4_revision being an | ||
10 | empty string however this value is used in BUILD_FILEVERSION where it is | ||
11 | assumed to be 4 decimal values. Additionally BUILD_REVISION uses this | ||
12 | value and is also assumed to be non-empty. | ||
13 | |||
14 | In the case of BUILD_FILEVERSION it is used in versioninfo.rc.in, where | ||
15 | it must be populated as 4 decimal values due to the expected syntax. In | ||
16 | cases where it is not (e.g. when BUILD_FILEVERSION = '1,26,0,' a syntax | ||
17 | error is raised. | ||
18 | |||
19 | windres: versioninfo.rc.in:21: syntax error | ||
20 | |||
21 | This patch changes mym4_revision so that if the 'git rev-parse' returns | ||
22 | non-zero (e.g. not in a git repository) the value falls back to '0'. | ||
23 | This propagates as '0' to both BUILD_FILEVERSION and BUILD_REVISION. | ||
24 | |||
25 | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> | ||
26 | Upstream-Status: Submitted | ||
27 | --- | ||
28 | configure.ac | 2 +- | ||
29 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
30 | |||
31 | diff --git a/configure.ac b/configure.ac | ||
32 | index 6d4f173d1b..149ac02b5f 100644 | ||
33 | --- a/configure.ac | ||
34 | +++ b/configure.ac | ||
35 | @@ -35,7 +35,7 @@ m4_define([mym4_version_minor], [27]) | ||
36 | # processing is done by autoconf and not during the configure run. | ||
37 | m4_define([mym4_version], [mym4_version_major.mym4_version_minor]) | ||
38 | m4_define([mym4_revision], | ||
39 | - m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) | ||
40 | + m4_esyscmd([(git rev-parse --short HEAD || printf '0') | tr -d '\n\r'])) | ||
41 | m4_define([mym4_revision_dec], | ||
42 | m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) | ||
43 | m4_define([mym4_betastring], | ||
44 | -- | ||
45 | 2.11.0 | ||
46 | |||
diff --git a/recipes-support/libgpg-error/libgpg-error_1.26.bbappend b/recipes-support/libgpg-error/libgpg-error_1.26.bbappend deleted file mode 100644 index e30e376..0000000 --- a/recipes-support/libgpg-error/libgpg-error_1.26.bbappend +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | |||
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
3 | SRC_URI_append = " \ | ||
4 | file://configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch \ | ||
5 | " | ||
6 | |||