diff options
| author |   Alex Kiernan <alex.kiernan@gmail.com> | 2018-09-20 15:06:05 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-21 08:15:19 -0700 |
| commit | 1a38f27342c5a40f81e579b2d0feb7b6e9880ac7 (patch) | |
| tree | efed9f6ee8db637682285e81cd799550b03c8ef0 | |
| parent | dfe55fdc34ae32b75934ea42b44d9ab6023e0250 (diff) | |
| download | openembedded-core-1a38f27342c5a40f81e579b2d0feb7b6e9880ac7.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.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch | 13 | ||||
| -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 @@ -From c3aa4aae5e9f4adafd9e10d9466f1bc481e0aae6 Mon Sep 17 00:00:00 2001 +From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 31 Jan 2018 16:47:44 +0200 Subject: [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 Upstream-Status: Inappropriate [missing upstream distribution files] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- po/LINGUAS | 2 -- 1 file changed, 2 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS -index 1fc4d53..e9cc5a7 100644 +index 767a806c2e20..6ab48001c409 100644 --- a/po/LINGUAS +++ b/po/LINGUAS -@@ -11,9 +11,7 @@ cy +@@ -12,8 +12,6 @@ cy da de el -en@boldquot - en_GB -en@quot + en_GB eo es - es_CL --- -2.15.1 - 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" SRC_URI = "git://github.com/p11-glue/p11-kit \ file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \ " -SRCREV = "bfb3bd47aa48983f5349479bca598403097ff81c" +SRCREV = "3770793f026e46a000d2d8816d56122598289d5c" S = "${WORKDIR}/git" -# exclude odd minor versions, which are development releases -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" AUTOTOOLS_AUXDIR = "${S}/build/litter" EXTRA_OECONF = "--without-trust-paths" |