From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- ...port-ARC-CPUs-and-simplify-aliasing-table.patch | 298 +++++++++++++++++++++ ...cfg-Add-support-for-arc-unknown-linux-gnu.patch | 35 +++ .../libgpg-error/libgpg-error/pkgconfig.patch | 67 +++-- .../libgpg-error/libgpg-error_1.27.bb | 62 ----- .../libgpg-error/libgpg-error_1.32.bb | 71 +++++ 5 files changed, 445 insertions(+), 88 deletions(-) create mode 100644 poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch create mode 100644 poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch delete mode 100644 poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb create mode 100644 poky/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb (limited to 'poky/meta/recipes-support/libgpg-error') diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch new file mode 100644 index 000000000..03b0ce77e --- /dev/null +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch @@ -0,0 +1,298 @@ +From d4fd6975671477721936060771aa4d7d07fb0910 Mon Sep 17 00:00:00 2001 +From: Werner Koch +Date: Tue, 18 Sep 2018 14:54:08 +0200 +Subject: [PATCH libgpg-error] syscfg: Support ARC CPUs and simplify aliasing + table. + +* src/mkheader.c (xmalloc): New. +(xstrdup): Implement using xmalloc. +(canon_host_triplet): Add supporr for arc CPU. Adjust alias table to +also alias *-pc-*. Rename ibm to unknown. Add internal arg. Add +unknown vendor hack. +(main): New mode to just print the canonicalized form. +* src/Makefile.am (lock_obj_pub): s/-(pc|ibm)-/-unknown/. Also rename +files accordingly. +-- + +config.sub does no real aliasing and thus we would need to add several +vendors to the alising tables despite that this has no technical +meanding. Instead we now replace the vendor with "unknown" for the +4-part-"triplets". This change will make maintenace easier. + +Signed-off-by: Werner Koch + +Upstream-Status: Backport [ http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=48c8f8ddfc80 ] +--- + src/Makefile.am | 16 ++-- + src/mkheader.c | 92 ++++++++++++++++--- + ...-gnu.h => lock-obj-pub.i686-unknown-gnu.h} | 0 + ... lock-obj-pub.i686-unknown-kfreebsd-gnu.h} | 0 + ... => lock-obj-pub.i686-unknown-linux-gnu.h} | 0 + ...=> lock-obj-pub.s390x-unknown-linux-gnu.h} | 0 + ...ock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} | 0 + ...> lock-obj-pub.x86_64-unknown-linux-gnu.h} | 0 + ...ock-obj-pub.x86_64-unknown-linux-gnux32.h} | 0 + ... lock-obj-pub.x86_64-unknown-linux-musl.h} | 0 + 10 files changed, 85 insertions(+), 23 deletions(-) + rename src/syscfg/{lock-obj-pub.i686-pc-gnu.h => lock-obj-pub.i686-unknown-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.i686-pc-kfreebsd-gnu.h => lock-obj-pub.i686-unknown-kfreebsd-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.i686-pc-linux-gnu.h => lock-obj-pub.i686-unknown-linux-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.s390x-ibm-linux-gnu.h => lock-obj-pub.s390x-unknown-linux-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.x86_64-pc-kfreebsd-gnu.h => lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnu.h => lock-obj-pub.x86_64-unknown-linux-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnux32.h => lock-obj-pub.x86_64-unknown-linux-gnux32.h} (100%) + rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-musl.h => lock-obj-pub.x86_64-unknown-linux-musl.h} (100%) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 42998e46a3bc..8ec582ef99fb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,9 +52,9 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.arm-apple-darwin.h \ + syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.i386-apple-darwin.h \ +- syscfg/lock-obj-pub.i686-pc-gnu.h \ +- syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h \ +- syscfg/lock-obj-pub.i686-pc-linux-gnu.h \ ++ syscfg/lock-obj-pub.i686-unknown-gnu.h \ ++ syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h \ ++ syscfg/lock-obj-pub.i686-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.m68k-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.mips-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.mips64el-unknown-linux-gnuabi64.h \ +@@ -66,16 +66,16 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ + syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ +- syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ ++ syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.x86_64-apple-darwin.h \ +- syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h \ +- syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h \ +- syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h \ +- syscfg/lock-obj-pub.x86_64-pc-linux-musl.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h \ + syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.ia64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.mingw32.h +diff --git a/src/mkheader.c b/src/mkheader.c +index 2fc5fada66a4..7a38a1bec1a4 100644 +--- a/src/mkheader.c ++++ b/src/mkheader.c +@@ -51,17 +51,27 @@ xfree (void *a) + + + static char * +-xstrdup (const char *string) ++xmalloc (size_t n) + { + char *p; +- size_t len = strlen (string) + 1; + +- p = malloc (len); ++ p = malloc (n); + if (!p) + { + fputs (PGM ": out of core\n", stderr); + exit (1); + } ++ return p; ++} ++ ++ ++static char * ++xstrdup (const char *string) ++{ ++ char *p; ++ size_t len = strlen (string) + 1; ++ ++ p = xmalloc (len); + memcpy (p, string, len); + return p; + } +@@ -69,23 +79,31 @@ xstrdup (const char *string) + + /* Return a malloced string with TRIPLET. If TRIPLET has an alias + return that instead. In general build-aux/config.sub should do the +- aliasing but some returned triplets are anyway identical and thus we +- use this function to map it to the canonical form. */ ++ aliasing but some returned triplets are anyway identical and thus ++ we use this function to map it to the canonical form. ++ NO_VENDOR_HACK is for internal use; caller must call with 0. */ + static char * +-canon_host_triplet (const char *triplet) ++canon_host_triplet (const char *triplet, int no_vendor_hack) + { + struct { + const char *name; + const char *alias; + } tbl[] = { +- {"i486-pc-linux-gnu", "i686-pc-linux-gnu" }, ++ {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" }, + {"i586-pc-linux-gnu" }, +- {"i486-pc-gnu", "i686-pc-gnu"}, ++ {"i686-pc-linux-gnu" }, ++ {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */ ++ ++ {"i486-pc-gnu", "i686-unknown-gnu"}, + {"i586-pc-gnu"}, +- {"i486-pc-kfreebsd-gnu", "i686-pc-kfreebsd-gnu"}, ++ {"i686-pc-gnu"}, ++ ++ {"i486-pc-kfreebsd-gnu", "i686-unknown-kfreebsd-gnu"}, + {"i586-pc-kfreebsd-gnu"}, ++ {"i686-pc-kfreebsd-gnu"}, + +- {"x86_64-pc-linux-gnuhardened1", "x86_64-pc-linux-gnu" }, ++ {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" }, ++ {"x86_64-pc-linux-gnu" }, + + {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, + +@@ -98,6 +116,7 @@ canon_host_triplet (const char *triplet) + }; + int i; + const char *lastalias = NULL; ++ const char *s; + + for (i=0; tbl[i].name; i++) + { +@@ -110,6 +129,36 @@ canon_host_triplet (const char *triplet) + return xstrdup (lastalias); + } + } ++ for (i=0, s=triplet; *s; s++) ++ if (*s == '-') ++ i++; ++ if (i > 2 && !no_vendor_hack) ++ { ++ /* We have a 4 part "triplet": CPU-VENDOR-KERNEL-SYSTEM where ++ * the last two parts replace the OS part of a real triplet. ++ * The VENDOR part is then in general useless because ++ * KERNEL-SYSTEM is specific enough. We now do a second pass by ++ * replacing VENDOR with "unknown". */ ++ char *p; ++ char *buf = xmalloc (strlen (triplet) + 7 + 1); ++ ++ for (p=buf,s=triplet,i=0; *s; s++) ++ { ++ *p++ = *s; ++ if (*s == '-' && ++i == 1) ++ { ++ memcpy (p, "unknown-",8); ++ p += 8; ++ for (s++; *s != '-'; s++) ++ ; ++ } ++ } ++ *p = 0; ++ p = canon_host_triplet (buf, 1); ++ xfree (buf); ++ return p; ++ } ++ + return xstrdup (triplet); + } + +@@ -558,7 +607,7 @@ write_special (const char *fname, int lnr, const char *tag) + int + main (int argc, char **argv) + { +- FILE *fp; ++ FILE *fp = NULL; + char line[LINESIZE]; + int lnr = 0; + const char *fname, *s; +@@ -571,11 +620,22 @@ main (int argc, char **argv) + argc--; argv++; + } + +- if (argc != 6) ++ if (argc == 1) ++ { ++ /* Print just the canonicalized host triplet. */ ++ host_triplet = canon_host_triplet (argv[0], 0); ++ printf ("%s\n", host_triplet); ++ goto leave; ++ } ++ else if (argc == 6) ++ ; /* Standard operation. */ ++ else + { + fputs ("usage: " PGM + " host_os host_triplet template.h config.h" +- " version version_number\n", ++ " version version_number\n" ++ " " PGM ++ " host_triplet\n", + stderr); + return 1; + } +@@ -586,7 +646,7 @@ main (int argc, char **argv) + hdr_version = argv[4]; + hdr_version_number = argv[5]; + +- host_triplet = canon_host_triplet (host_triplet_raw); ++ host_triplet = canon_host_triplet (host_triplet_raw, 0); + + srcdir = malloc (strlen (fname) + 2 + 1); + if (!srcdir) +@@ -677,13 +737,15 @@ main (int argc, char **argv) + "End:\n" + "*/\n", stdout); + ++ leave: + if (ferror (stdout)) + { + fprintf (stderr, PGM ": error writing to stdout: %s\n", strerror (errno)); + return 1; + } + +- fclose (fp); ++ if (fp) ++ fclose (fp); + + xfree (host_triplet); + return 0; +diff --git a/src/syscfg/lock-obj-pub.i686-pc-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.i686-pc-gnu.h +rename to src/syscfg/lock-obj-pub.i686-unknown-gnu.h +diff --git a/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h +rename to src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h +diff --git a/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h +rename to src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h +diff --git a/src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h b/src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h +rename to src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h +diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h +rename to src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h +diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h +rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h +diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h +rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h +diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h +rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch new file mode 100644 index 000000000..197652f28 --- /dev/null +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch @@ -0,0 +1,35 @@ +From ae6a3f20345dac4b9daab8c39ac2d3fb3f2c21e3 Mon Sep 17 00:00:00 2001 +From: Werner Koch +Date: Fri, 21 Sep 2018 14:37:21 +0200 +Subject: [PATCH Libgpg-error] syscfg: Add support for arc-unknown-linux-gnu + +* src/mkheader.c (canon_host_triplet): Add to table. +-- + +Note that unknown in the above triplet is actually a wildcard for 4 +part triplets. + +Signed-off-by: Werner Koch + +Upstream-Status: Backport [http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=f4f0da74f526d7e35cedbc2e93454df6440dbfa5] +--- + src/mkheader.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mkheader.c b/src/mkheader.c +index 7a38a1bec1a4..a4866e96ef43 100644 +--- a/src/mkheader.c ++++ b/src/mkheader.c +@@ -92,7 +92,8 @@ canon_host_triplet (const char *triplet, int no_vendor_hack) + {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" }, + {"i586-pc-linux-gnu" }, + {"i686-pc-linux-gnu" }, +- {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */ ++ {"arc-oe-linux-gnu" }, /* Other CPU but same struct. */ ++ {"arc-oe-linux-uclibc" }, /* and uclibc is also the same. */ + + {"i486-pc-gnu", "i686-unknown-gnu"}, + {"i586-pc-gnu"}, +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 9ffeedbe5..3066613d4 100644 --- a/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -1,15 +1,26 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# +From ec309e20b5a27d42a5fb915c328d61e924ab5f19 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 29 Mar 2018 15:12:17 +0800 +Subject: [PATCH] support pkgconfig Upstream-Status: Pending -Index: libgpg-error-1.17/configure.ac -=================================================================== ---- libgpg-error-1.17.orig/configure.ac -+++ libgpg-error-1.17/configure.ac -@@ -529,6 +529,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make +Rebase to 1.28 + +Signed-off-by: Hongxu Jia +--- + configure.ac | 1 + + src/Makefile.am | 4 ++- + src/gpg-error.m4 | 71 +++-------------------------------------------------- + src/gpg-error.pc.in | 11 +++++++++ + 4 files changed, 18 insertions(+), 69 deletions(-) + create mode 100644 src/gpg-error.pc.in + +diff --git a/configure.ac b/configure.ac +index aca9300..f7794e9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -621,6 +621,7 @@ AC_CONFIG_FILES([src/Makefile tests/Makefile]) AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) @@ -17,33 +28,33 @@ Index: libgpg-error-1.17/configure.ac AC_OUTPUT -Index: libgpg-error-1.17/src/Makefile.am -=================================================================== ---- libgpg-error-1.17.orig/src/Makefile.am -+++ libgpg-error-1.17/src/Makefile.am -@@ -75,6 +75,8 @@ nodist_include_HEADERS = gpg-error.h - bin_SCRIPTS = gpg-error-config +diff --git a/src/Makefile.am b/src/Makefile.am +index 268c2ab..95f8459 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -87,6 +87,8 @@ bin_SCRIPTS = gpg-error-config + nodist_bin_SCRIPTS = gpgrt-config m4datadir = $(datadir)/aclocal - m4data_DATA = gpg-error.m4 + m4data_DATA = gpg-error.m4 gpgrt.m4 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gpg-error.pc EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ -@@ -82,7 +84,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. +@@ -94,7 +96,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ - err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ + err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \ gpg-error.vers gpg-error.def.in \ - versioninfo.rc.in gpg-error.w32-manifest.in \ + versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ $(lock_obj_pub) BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ -Index: libgpg-error-1.17/src/gpg-error.m4 -=================================================================== ---- libgpg-error-1.17.orig/src/gpg-error.m4 -+++ libgpg-error-1.17/src/gpg-error.m4 -@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa +diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 +index 60c88d8..2ef7e3e 100644 +--- a/src/gpg-error.m4 ++++ b/src/gpg-error.m4 +@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPG_ERROR], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -132,10 +143,11 @@ Index: libgpg-error-1.17/src/gpg-error.m4 ifelse([$3], , :, [$3]) fi AC_SUBST(GPG_ERROR_CFLAGS) -Index: libgpg-error-1.17/src/gpg-error.pc.in -=================================================================== +diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in +new file mode 100644 +index 0000000..bc0b174 --- /dev/null -+++ libgpg-error-1.17/src/gpg-error.pc.in ++++ b/src/gpg-error.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -148,3 +160,6 @@ Index: libgpg-error-1.17/src/gpg-error.pc.in +Version: @VERSION@ +Libs: -L${libdir} -lgpg-error +Cflags: -I${includedir} +-- +1.8.3.1 + diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb deleted file mode 100644 index b74f079f5..000000000 --- a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Small library that defines common error values for all GnuPG components" -HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" -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=beae1e44d8d5c265d194760276033a7c \ - file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" - - -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 \ - " - -SRC_URI[md5sum] = "5217ef3e76a7275a2a3b569a12ddc989" -SRC_URI[sha256sum] = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2" - -BINCONFIG = "${bindir}/gpg-error-config" - -inherit autotools binconfig-disabled pkgconfig gettext multilib_header -CPPFLAGS += "-P" -do_compile_prepend() { - TARGET_FILE=linux-gnu - if [ ${TARGET_OS} = "mingw32" ]; then - # There are no arch specific syscfg files for mingw32 - TARGET_FILE= - elif [ ${TARGET_OS} != "linux" ]; then - TARGET_FILE=${TARGET_OS} - fi - - case ${TARGET_ARCH} in - aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;; - arm) TUPLE=arm-unknown-linux-gnueabi ;; - armeb) TUPLE=arm-unknown-linux-gnueabi ;; - i586|i686) TUPLE=i686-pc-linux-gnu ;; - mips64*) TUPLE=mips64el-unknown-linux-gnuabi64 ;; - mips*el) TUPLE=mipsel-unknown-linux-gnu ;; - mips*) TUPLE=mips-unknown-linux-gnu ;; - x86_64) TUPLE=x86_64-pc-linux-gnu ;; - *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; - esac - - if [ -n "$TARGET_FILE" ]; then - cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ - ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h - fi -} - -do_install_append() { - # we don't have common lisp in OE - rm -rf "${D}${datadir}/common-lisp/" - oe_multilib_header gpg-error.h gpgrt.h -} - -FILES_${PN}-dev += "${bindir}/gpg-error" -FILES_${PN}-doc += "${datadir}/libgpg-error/errorref.txt" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb new file mode 100644 index 000000000..e552001cb --- /dev/null +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb @@ -0,0 +1,71 @@ +SUMMARY = "Small library that defines common error values for all GnuPG components" +HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" +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;beginline=2;endline=18;md5=524d4e810c4dcdc38e4fa28e70a13bf8 \ + file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7" + + +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-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch \ + file://0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch \ + " +SRC_URI[md5sum] = "ef3d928a5a453fa701ecc3bb22be1c64" +SRC_URI[sha256sum] = "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca" + +BINCONFIG = "${bindir}/gpg-error-config" + +inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config" + +CPPFLAGS += "-P" +do_compile_prepend() { + TARGET_FILE=linux-gnu + if [ ${TARGET_OS} = "mingw32" ]; then + # There are no arch specific syscfg files for mingw32 + TARGET_FILE= + elif [ ${TARGET_ARCH} = "arc" ]; then + # ARC syscfg file is automatically aliased to i686-pc-linux-gnu + TARGET_FILE= + elif [ ${TARGET_OS} != "linux" ]; then + TARGET_FILE=${TARGET_OS} + fi + + case ${TARGET_ARCH} in + aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;; + arm) TUPLE=arm-unknown-linux-gnueabi ;; + armeb) TUPLE=arm-unknown-linux-gnueabi ;; + i586|i686) TUPLE=i686-unknown-linux-gnu;; + mips64*) TUPLE=mips64el-unknown-linux-gnuabi64 ;; + mips*el) TUPLE=mipsel-unknown-linux-gnu ;; + mips*) TUPLE=mips-unknown-linux-gnu ;; + x86_64) TUPLE=x86_64-unknown-linux-gnu ;; + ppc64) TUPLE=powerpc64-unknown-linux-gnu ;; + ppc64le) TUPLE=powerpc64le-unknown-linux-gnu ;; + *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; + esac + + if [ -n "$TARGET_FILE" ]; then + cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ + ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h + fi +} + +do_install_append() { + # we don't have common lisp in OE + rm -rf "${D}${datadir}/common-lisp/" + oe_multilib_header gpg-error.h gpgrt.h +} + +FILES_${PN}-dev += "${bindir}/gpg-error" +FILES_${PN}-doc += "${datadir}/libgpg-error/errorref.txt" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3