summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-25 09:38:47 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-30 15:58:13 +0100
commit2dbd8733a76adc8619ea3ac491e335e878ecb01e (patch)
tree5f35c5ca058fea493227ea2a98137e5381acafbb /meta
parent145d28571db03742c8f4d240d52694a177f3a15a (diff)
downloadpoky-2dbd8733a76adc8619ea3ac491e335e878ecb01e.tar.gz
libgpg-error: Upgrade 1.21 -> 1.22
License checksum changes are not license changes. Remove a patch that's in upstream now. (From OE-Core rev: 3493bda7c10ba12a596ba0224eca646b93ea9181) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch46
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.22.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.21.bb)9
2 files changed, 4 insertions, 51 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch
deleted file mode 100644
index dab1c13b6e..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From b2af652f43991e4ce6297917da542a9eb5135939 Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de>
3Date: Thu, 17 Sep 2015 03:28:06 +0200
4Subject: [PATCH] libgpg-error: Add nios2 support
5
6Add configuration for the NIOS2 processor.
7
8Signed-off-by: Marek Vasut <marex@denx.de>
9Upstream-Status: Submitted
10---
11 src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h | 23 +++++++++++++++++++++++
12 1 file changed, 23 insertions(+)
13 create mode 100644 src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h
14
15diff --git a/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h
16new file mode 100644
17index 0000000..3a24571
18--- /dev/null
19+++ b/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h
20@@ -0,0 +1,23 @@
21+## lock-obj-pub.nios2-unknown-linux-gnu.h
22+## File created by gen-posix-lock-obj - DO NOT EDIT
23+## To be included by mkheader into gpg-error.h
24+
25+typedef struct
26+{
27+ long _vers;
28+ union {
29+ volatile char _priv[24];
30+ long _x_align;
31+ long *_xp_align;
32+ } u;
33+} gpgrt_lock_t;
34+
35+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
36+ 0,0,0,0,0,0,0,0, \
37+ 0,0,0,0,0,0,0,0}}}
38+##
39+## Local Variables:
40+## mode: c
41+## buffer-read-only: t
42+## End:
43+##
44--
452.5.1
46
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.21.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.22.bb
index e4190ce540..7231898081 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.21.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.22.bb
@@ -5,8 +5,8 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
5LICENSE = "GPLv2+ & LGPLv2.1+" 5LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/gpg-error.h.in;endline=23;md5=93d3155af141ae3b369a5d09ca9d6234 \ 8 file://src/gpg-error.h.in;endline=23;md5=cf562f60b9dba7df20d6ee3f97ea1d5a \
9 file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe" 9 file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc"
10 10
11 11
12SECTION = "libs" 12SECTION = "libs"
@@ -14,10 +14,9 @@ SECTION = "libs"
14UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 14UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
15SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ 15SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
16 file://pkgconfig.patch \ 16 file://pkgconfig.patch \
17 file://0001-libgpg-error-Add-nios2-support.patch \
18 " 17 "
19SRC_URI[md5sum] = "ab0b5aba6d0a185b41d07bda804fd8b2" 18SRC_URI[md5sum] = "83c686abe3fa223ec89f3b51da830770"
20SRC_URI[sha256sum] = "b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d" 19SRC_URI[sha256sum] = "f2a04ee6317bdb41a625bea23fdc7f0b5a63fb677f02447c647ed61fb9e69d7b"
21 20
22BINCONFIG = "${bindir}/gpg-error-config" 21BINCONFIG = "${bindir}/gpg-error-config"
23 22