[OE-core] [PATCH v2] (jethro) rpm: Fix the Bug of SRPM String error

[Khem Raj]

On Wed, Jun 21, 2017 at 9:06 PM zhengrq <zhengrq.fnst at cn.fujitsu.com> wrote:

> Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug
>
> When use bitbake to build a SRPM package, some sections of SRPM can't be
> displayed normally.
> For example:
> $ rpm -qpi zlib-1.2.8-r0.src.rpm
> warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID
> e64962a6: NOKEY
> Name        : zlib
> Version     : 1.2.8
> Release     : r0
> Architecture: i586
> Install Date: (not installed)
> Group       : ﺩ
> Size        : 633007
> License     : Zlib
> Signature   : DSA/SHA1, 2017年04月22日 00時38分03秒, Key ID bc5e0520e64962a6
> Source RPM  : (none)
> Build Date  : 2017年04月22日 00時38分03秒
> Build Host  : force
> Relocations : (not relocatable)
> Packager    : Poky <poky at yoctoproject.org>
> URL         : http://zlib.net/
> Summary     : ¨¯
> Description :


We need to get rid of special chsrtacters in commit message

>
> ﺩ
>
> Signed-off-by: zhengrq <zhengrq.fnst at cn.fujitsu.com>
> ---
>  .../0001-Fix-the-Bug-of-SRPM-String-error.patch    | 48
> ++++++++++++++++++++++
>  meta/recipes-devtools/rpm/rpm_5.4.14.bb            |  1 +
>  2 files changed, 49 insertions(+)
>  create mode 100644
> meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch
>
> diff --git
> a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch
> b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch
> new file mode 100644
> index 0000000..b962617
> --- /dev/null
> +++
> b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch
> @@ -0,0 +1,48 @@
> +Subject: [PATCH] Fix the Bug of SRPM String error
> +
> +Upstream-Status: Pending
> +$ rpm -qpi zlib-1.2.8-r0.src.rpm
> +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID
> e64962a6: NOKEY
> +Name        : zlib
> +Version     : 1.2.8
> +Release     : r0
> +Architecture: i586
> +Install Date: (not installed)
> +Group       : ﺩ
> +Size        : 633007
> +License     : Zlib
> +Signature   : DSA/SHA1, 2017年04月22日 00時38分03秒, Key ID bc5e0520e64962a6
> +Source RPM  : (none)
> +Build Date  : 2017年04月22日 00時38分03秒
> +Build Host  : force
> +Relocations : (not relocatable)
> +Packager    : Poky <poky at yoctoproject.org>
> +URL         : http://zlib.net/
> +Summary     : ¨¯
> +Description :
> +ﺩ
> +
> +Signed-off-by: zhengrq <zhengrq.fnst at cn.fujitsu.com>
> +---
> + rpmdb/tagname.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c
> +index cfd1459..dbcafd1 100644
> +--- a/rpmdb/tagname.c
> ++++ b/rpmdb/tagname.c
> +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t
> dbiNTags)
> + void tagTypeValidate(HE_t he);
> + void tagTypeValidate(HE_t he)
> + {
> +-    /* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */
> ++    /* XXX RPM_I18NSTRING_TYPE is treated as strings. */
> +     if (he->t == RPM_I18NSTRING_TYPE)
> +-      he->t = RPM_STRING_TYPE;
> ++      return;
> +
> +     /* XXX Arbitrary tags are always strings. */
> +     if ((he->tag & 0x40000000)
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> index 73b3734..f8bdfe9 100644
> --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> @@ -100,6 +100,7 @@ SRC_URI = "
> http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
>            file://rpm-macros.in-disable-external-key-server.patch \
>            file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch
> \
>            file://configure.ac-check-for-both-gpg2-and-gpg.patch \
> +          file://0001-Fix-the-Bug-of-SRPM-String-error.patch \
>           "
>
>  # Uncomment the following line to enable platform score debugging
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170622/2f4218fd/attachment-0002.html>