diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-25 09:38:47 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-30 09:30:32 +0100 |
| commit | 3493bda7c10ba12a596ba0224eca646b93ea9181 (patch) | |
| tree | 4fe3d5cef98cde2af8ed795a2c5f1d56efb12772 /meta/recipes-support/libgpg-error | |
| parent | dfc9178e2f2b6873ca497d981e308e00d15280b5 (diff) | |
| download | openembedded-core-3493bda7c10ba12a596ba0224eca646b93ea9181.tar.gz openembedded-core-3493bda7c10ba12a596ba0224eca646b93ea9181.tar.bz2 openembedded-core-3493bda7c10ba12a596ba0224eca646b93ea9181.zip | |
libgpg-error: Upgrade 1.21 -> 1.22
License checksum changes are not license changes.
Remove a patch that's in upstream now.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/libgpg-error')
| -rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/0001-libgpg-error-Add-nios2-support.patch | 46 | ||||
| -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 @@ -From b2af652f43991e4ce6297917da542a9eb5135939 Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Thu, 17 Sep 2015 03:28:06 +0200 -Subject: [PATCH] libgpg-error: Add nios2 support - -Add configuration for the NIOS2 processor. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Submitted ---- - src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - create mode 100644 src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h - -diff --git a/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h -new file mode 100644 -index 0000000..3a24571 ---- /dev/null -+++ b/src/syscfg/lock-obj-pub.nios2-unknown-linux-gnu.h -@@ -0,0 +1,23 @@ -+## lock-obj-pub.nios2-unknown-linux-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[24]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## --- -2.5.1 - 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" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;endline=23;md5=93d3155af141ae3b369a5d09ca9d6234 \ - file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe" + file://src/gpg-error.h.in;endline=23;md5=cf562f60b9dba7df20d6ee3f97ea1d5a \ + file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" SECTION = "libs" @@ -14,10 +14,9 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://0001-libgpg-error-Add-nios2-support.patch \ " -SRC_URI[md5sum] = "ab0b5aba6d0a185b41d07bda804fd8b2" -SRC_URI[sha256sum] = "b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d" +SRC_URI[md5sum] = "83c686abe3fa223ec89f3b51da830770" +SRC_URI[sha256sum] = "f2a04ee6317bdb41a625bea23fdc7f0b5a63fb677f02447c647ed61fb9e69d7b" BINCONFIG = "${bindir}/gpg-error-config" |