From: Trevor Gamblin <trevor.gamblin@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37
Date: Thu, 27 Feb 2020 11:24:18 -0500 [thread overview]
Message-ID: <d3d3f4a4-e792-397c-4444-c39630afaf74@windriver.com> (raw)
In-Reply-To: <20200226183902.3616626-1-trevor.gamblin@windriver.com>
Looks like I got beat by a day!
On 2/26/20 1:39 PM, Trevor Gamblin wrote:
> https://dev.gnupg.org/T4459 was fixed in 1.37, so the backported
> patch is removed.
>
> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
> .../libgpg-error-1.36-gawk5-support.patch | 144 ------------------
> ...gpg-error_1.36.bb => libgpg-error_1.37.bb} | 5 +-
> 2 files changed, 2 insertions(+), 147 deletions(-)
> delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
> rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%)
>
> diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
> deleted file mode 100644
> index b936d1143b..0000000000
> --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -Upstream-Status: Backport [https://dev.gnupg.org/T4459]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
> -From: NIIBE Yutaka <gniibe@fsij.org>
> -Date: Mon, 15 Apr 2019 15:10:44 +0900
> -Subject: [PATCH] awk: Prepare for Gawk 5.0.
> -
> -* src/Makefile.am: Use pkg_namespace (instead of namespace).
> -* src/mkerrnos.awk: Likewise.
> -* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
> -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
> -
> ---
> -
> -In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
> -which only allows escaping specific characters.
> -
> -GnuPG-bug-id: 4459
> -Reported-by: Marius Schamschula
> -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
> ----
> - lang/cl/mkerrcodes.awk | 2 +-
> - src/Makefile.am | 2 +-
> - src/mkerrcodes.awk | 2 +-
> - src/mkerrcodes1.awk | 2 +-
> - src/mkerrcodes2.awk | 2 +-
> - src/mkerrnos.awk | 2 +-
> - src/mkstrtable.awk | 10 +++++-----
> - 7 files changed, 11 insertions(+), 11 deletions(-)
> -
> ---- a/lang/cl/mkerrcodes.awk
> -+++ b/lang/cl/mkerrcodes.awk
> -@@ -122,7 +122,7 @@ header {
> - }
> -
> - !header {
> -- sub (/\#.+/, "");
> -+ sub (/#.+/, "");
> - sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> -
> - if (/^$/)
> ---- a/src/Makefile.am
> -+++ b/src/Makefile.am
> -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
> -
> - errnos-sym.h: Makefile mkstrtable.awk errnos.in
> - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
> -- -v prefix=GPG_ERR_ -v namespace=errnos_ \
> -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
> - $(srcdir)/errnos.in >$@
> -
> -
> ---- a/src/mkerrcodes.awk
> -+++ b/src/mkerrcodes.awk
> -@@ -85,7 +85,7 @@ header {
> - }
> -
> - !header {
> -- sub (/\#.+/, "");
> -+ sub (/#.+/, "");
> - sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> -
> - if (/^$/)
> ---- a/src/mkerrcodes1.awk
> -+++ b/src/mkerrcodes1.awk
> -@@ -81,7 +81,7 @@ header {
> - }
> -
> - !header {
> -- sub (/\#.+/, "");
> -+ sub (/#.+/, "");
> - sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> -
> - if (/^$/)
> ---- a/src/mkerrcodes2.awk
> -+++ b/src/mkerrcodes2.awk
> -@@ -91,7 +91,7 @@ header {
> - }
> -
> - !header {
> -- sub (/\#.+/, "");
> -+ sub (/#.+/, "");
> - sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> -
> - if (/^$/)
> ---- a/src/mkerrnos.awk
> -+++ b/src/mkerrnos.awk
> -@@ -83,7 +83,7 @@ header {
> - }
> -
> - !header {
> -- sub (/\#.+/, "");
> -+ sub (/#.+/, "");
> - sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> -
> - if (/^$/)
> ---- a/src/mkstrtable.awk
> -+++ b/src/mkstrtable.awk
> -@@ -77,7 +77,7 @@
> - #
> - # The variable prefix can be used to prepend a string to each message.
> - #
> --# The variable namespace can be used to prepend a string to each
> -+# The variable pkg_namespace can be used to prepend a string to each
> - # variable and macro name.
> -
> - BEGIN {
> -@@ -102,7 +102,7 @@ header {
> - print "/* The purpose of this complex string table is to produce";
> - print " optimal code with a minimum of relocations. */";
> - print "";
> -- print "static const char " namespace "msgstr[] = ";
> -+ print "static const char " pkg_namespace "msgstr[] = ";
> - header = 0;
> - }
> - else
> -@@ -110,7 +110,7 @@ header {
> - }
> -
> - !header {
> -- sub (/\#.+/, "");
> -+ sub (/#.+/, "");
> - sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> -
> - if (/^$/)
> -@@ -150,7 +150,7 @@ END {
> - else
> - print " gettext_noop (\"" last_msgstr "\");";
> - print "";
> -- print "static const int " namespace "msgidx[] =";
> -+ print "static const int " pkg_namespace "msgidx[] =";
> - print " {";
> - for (i = 0; i < coded_msgs; i++)
> - print " " pos[i] ",";
> -@@ -158,7 +158,7 @@ END {
> - print " };";
> - print "";
> - print "static GPG_ERR_INLINE int";
> -- print namespace "msgidxof (int code)";
> -+ print pkg_namespace "msgidxof (int code)";
> - print "{";
> - print " return (0 ? 0";
> -
> diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
> similarity index 92%
> rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
> index b11ab0548d..bf1da84eb9 100644
> --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
> @@ -14,11 +14,10 @@ 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://libgpg-error-1.36-gawk5-support.patch \
> "
>
> -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed"
> -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
> +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
> +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
>
> BINCONFIG = "${bindir}/gpg-error-config"
>
next prev parent reply other threads:[~2020-02-27 16:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 18:39 [PATCH] libgpg-error: upgrade 1.36 -> 1.37 Trevor Gamblin
2020-02-27 16:24 ` Trevor Gamblin [this message]
2020-02-27 23:14 ` Richard Purdie
2020-02-27 23:41 ` Trevor Gamblin
2020-02-28 9:28 ` Alexander Kanavin
-- strict thread matches above, loose matches on Subject: below --
2020-02-28 9:25 Alexander Kanavin
2020-02-14 23:44 [PATCH] ell: upgrade 0.27 -> 0.28 Wang Mingyu
2020-02-14 23:44 ` [PATCH] libgpg-error: upgrade 1.36 -> 1.37 Wang Mingyu
2020-02-15 8:03 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d3d3f4a4-e792-397c-4444-c39630afaf74@windriver.com \
--to=trevor.gamblin@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.