summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-09-20 15:06:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 18:45:47 -0700
commite7e081aa2ade429ad28e4c488ee62153aa7839eb (patch)
tree6821b0f432daae79308b9e117128790139cb2ee9
parent631b3edebd1acc963aecdfffa066c78dc9bf98ef (diff)
downloadpoky-e7e081aa2ade429ad28e4c488ee62153aa7839eb.tar.gz
p11-kit: Upgrade from 0.22.1 -> 0.23.14
p11-kit is no longer doing odd/even for development/stable releases, so drop the custom UPSTREAM_CHECK_GITTAGREGEX. (From OE-Core rev: 1a38f27342c5a40f81e579b2d0feb7b6e9880ac7) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch13
-rw-r--r--meta/recipes-support/p11-kit/p11-kit_0.23.14.bb (renamed from meta/recipes-support/p11-kit/p11-kit_0.22.1.bb)4
2 files changed, 6 insertions, 11 deletions
diff --git a/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch b/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
index 2fda9dfbb8..e902b0b522 100644
--- a/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
+++ b/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
@@ -1,4 +1,4 @@
1From c3aa4aae5e9f4adafd9e10d9466f1bc481e0aae6 Mon Sep 17 00:00:00 2001 1From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 31 Jan 2018 16:47:44 +0200 3Date: Wed, 31 Jan 2018 16:47:44 +0200
4Subject: [PATCH] LINGUAS: drop the languages for which upstream does not 4Subject: [PATCH] LINGUAS: drop the languages for which upstream does not
@@ -9,24 +9,21 @@ Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127
9 9
10Upstream-Status: Inappropriate [missing upstream distribution files] 10Upstream-Status: Inappropriate [missing upstream distribution files]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
12--- 13---
13 po/LINGUAS | 2 -- 14 po/LINGUAS | 2 --
14 1 file changed, 2 deletions(-) 15 1 file changed, 2 deletions(-)
15 16
16diff --git a/po/LINGUAS b/po/LINGUAS 17diff --git a/po/LINGUAS b/po/LINGUAS
17index 1fc4d53..e9cc5a7 100644 18index 767a806c2e20..6ab48001c409 100644
18--- a/po/LINGUAS 19--- a/po/LINGUAS
19+++ b/po/LINGUAS 20+++ b/po/LINGUAS
20@@ -11,9 +11,7 @@ cy 21@@ -12,8 +12,6 @@ cy
21 da 22 da
22 de 23 de
23 el 24 el
24-en@boldquot 25-en@boldquot
25 en_GB
26-en@quot 26-en@quot
27 en_GB
27 eo 28 eo
28 es 29 es
29 es_CL
30--
312.15.1
32
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb
index 57798f4020..2a8709143b 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb
@@ -9,10 +9,8 @@ DEPENDS = "libtasn1 libffi"
9SRC_URI = "git://github.com/p11-glue/p11-kit \ 9SRC_URI = "git://github.com/p11-glue/p11-kit \
10 file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \ 10 file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \
11 " 11 "
12SRCREV = "bfb3bd47aa48983f5349479bca598403097ff81c" 12SRCREV = "3770793f026e46a000d2d8816d56122598289d5c"
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14# exclude odd minor versions, which are development releases
15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
16 14
17AUTOTOOLS_AUXDIR = "${S}/build/litter" 15AUTOTOOLS_AUXDIR = "${S}/build/litter"
18EXTRA_OECONF = "--without-trust-paths" 16EXTRA_OECONF = "--without-trust-paths"