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 <p...@yoctoproject.org> URL : http://zlib.net/ Summary : ???? Description : ???
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 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 <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : ???? +Description : +??? + +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 & 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
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
