[PATCH v3] (morty) rpm: Fix the Bug of SRPM String error

[PATCH v3] (morty) rpm: Fix the Bug of SRPM String error

[zhengrq]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="y", Size: 3538 bytes --]

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 bash-4.3.30-r0.src.rpm
warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY
Name        : bash
Version     : 4.3.30
Release     : r0
Architecture: i586
Install Date: (not installed)
Group       : ԯ
Size        : 8413797
License     : GPLv3+
Signature   : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e
Source RPM  : (none)
Build Date  : Wed 21 Jun 2017 07:37:52 PM PDT
Build Host  : ubuntu
Relocations : (not relocatable)
Packager    : Poky <poky@yoctoproject.org>
URL         : http://tiswww.case.edu/php/chet/bash/bashtop.html
Summary     : 8
Description :
8 

Signed-off-by: zhengrq <zhengrq.fnst@cn.fujitsu.com>
---
 .../0001-Fix-the-Bug-of-SRPM-String-error.patch    | 48 ++++++++++++++++++++++
 meta/recipes-devtools/rpm/rpm_5.4.16.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 bash-4.3.30-r0.src.rpm
+warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY
+Name        : bash
+Version     : 4.3.30
+Release     : r0
+Architecture: i586
+Install Date: (not installed)
+Group       : ԯ
+Size        : 8413797
+License     : GPLv3+
+Signature   : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e
+Source RPM  : (none)
+Build Date  : Wed 21 Jun 2017 07:37:52 PM PDT
+Build Host  : ubuntu
+Relocations : (not relocatable)
+Packager    : Poky <poky@yoctoproject.org>
+URL         : http://tiswww.case.edu/php/chet/bash/bashtop.html
+Summary     : 8
+Description :
+8 
+
+Signed-off-by: zhengrq <zhengrq.fnst@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.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 497af8e..ae5e0c4 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -120,6 +120,7 @@ SRC_URI += " \
 	   file://0001-system.h-query.c-support-nosignature.patch \
 	   file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \
 	   file://0001-macros-add-_gpg_sign_cmd_extra_args.patch \
+	   file://0001-Fix-the-Bug-of-SRPM-String-error.patch \
 "
 
 # OE specific changes
-- 
2.7.4

✗ patchtest: failure for (morty) rpm: Fix the Bug of SRPM String error (rev2)

[Patchwork]

== Series Details ==

Series: (morty) rpm: Fix the Bug of SRPM String error (rev2)
Revision: 2
URL   : https://patchwork.openembedded.org/series/7416/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 7c36b4316a)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: ✗ patchtest: failure for (morty) rpm: Fix the Bug of SRPM String error (rev2)

[Leonardo Sandoval]

On Fri, 2017-06-23 at 02:01 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: (morty) rpm: Fix the Bug of SRPM String error (rev2)
> Revision: 2
> URL   : https://patchwork.openembedded.org/series/7416/
> State : failure
> 
> == Summary ==
> 
> 
> Thank you for submitting this patch series to OpenEmbedded Core. This is
> an automated response. Several tests have been executed on the proposed
> series by patchtest resulting in the following failures:
> 
> 
> 
> * Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
>   Suggested fix    Rebase your series on top of targeted branch
>   Targeted branch  master (currently at 7c36b4316a)


For the moment, incoming patches are tested based on master, so
non-master patches may fail when apply/am to master. So this is a false
positive result. I will fix it.

Leo

> 
> 
> 
> If you believe any of these test results are incorrect, please reply to the
> mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
> Otherwise we would appreciate you correcting the issues and submitting a new
> version of the patchset if applicable. Please ensure you add/increment the
> version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
> [PATCH v3] -> ...).
> 
> ---
> Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
> Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
> 

Re: [PATCH v3] (morty) rpm: Fix the Bug of SRPM String error

[Zheng, Ruoqin]

ping

-----Original Message-----
From: Zheng, Ruoqin/郑 若钦 
Sent: Friday, June 23, 2017 9:56 AM
To: openembedded-core@lists.openembedded.org
Cc: Zheng, Ruoqin/郑 若钦 <zhengrq.fnst@cn.fujitsu.com>
Subject: [OE-core] [PATCH v3] (morty) rpm: Fix the Bug of SRPM String error

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 bash-4.3.30-r0.src.rpm
warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY
Name        : bash
Version     : 4.3.30
Release     : r0
Architecture: i586
Install Date: (not installed)
Group       : Ô¯
Size        : 8413797
License     : GPLv3+
Signature   : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e
Source RPM  : (none)
Build Date  : Wed 21 Jun 2017 07:37:52 PM PDT Build Host  : ubuntu Relocations : (not relocatable)
Packager    : Poky <poky@yoctoproject.org>
URL         : http://tiswww.case.edu/php/chet/bash/bashtop.html
Summary     : 8
Description :
8 

Signed-off-by: zhengrq <zhengrq.fnst@cn.fujitsu.com>
---
 .../0001-Fix-the-Bug-of-SRPM-String-error.patch    | 48 ++++++++++++++++++++++
 meta/recipes-devtools/rpm/rpm_5.4.16.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-erro
+++ r.patch
@@ -0,0 +1,48 @@
+Subject: [PATCH] Fix the Bug of SRPM String error
+
+Upstream-Status: Pending
+$ rpm -qpi bash-4.3.30-r0.src.rpm
+warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY
+Name        : bash
+Version     : 4.3.30
+Release     : r0
+Architecture: i586
+Install Date: (not installed)
+Group       : Ô¯
+Size        : 8413797
+License     : GPLv3+
+Signature   : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e
+Source RPM  : (none)
+Build Date  : Wed 21 Jun 2017 07:37:52 PM PDT Build Host  : ubuntu 
+Relocations : (not relocatable)
+Packager    : Poky <poky@yoctoproject.org>
+URL         : http://tiswww.case.edu/php/chet/bash/bashtop.html
+Summary     : 8
+Description :
+8
+
+Signed-off-by: zhengrq <zhengrq.fnst@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.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 497af8e..ae5e0c4 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -120,6 +120,7 @@ SRC_URI += " \
 	   file://0001-system.h-query.c-support-nosignature.patch \
 	   file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \
 	   file://0001-macros-add-_gpg_sign_cmd_extra_args.patch \
+	   file://0001-Fix-the-Bug-of-SRPM-String-error.patch \
 "
 
 # OE specific changes
--
2.7.4