Re: [OE-core] [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.f...@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 <p...@yoctoproject.org>
URL : http://tiswww.case.edu/php/chet/bash/bashtop.html
Summary : 8
Description :
8 

Signed-off-by: zhengrq <zhengrq.f...@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 000..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 <p...@yoctoproject.org>
+URL : http://tiswww.case.edu/php/chet/bash/bashtop.html
+Summary : 8
+Description :
+8
+
+Signed-off-by: zhengrq <zhengrq.f...@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 & 0x4000)
+--
+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



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

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

[zhengrq]

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 
URL : http://tiswww.case.edu/php/chet/bash/bashtop.html
Summary : 8
Description :
8 

Signed-off-by: zhengrq 
---
 .../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 000..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 
+URL : http://tiswww.case.edu/php/chet/bash/bashtop.html
+Summary : 8
+Description :
+8 
+
+Signed-off-by: zhengrq 
+---
+ 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 & 0x4000)
+-- 
+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



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core