sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

rpm: Enable compatibility with older RPM packages that have invalid platforms 

Some LSB packages appear to have the platform set to '%{_target_platform}'
which is not a valid platform field.  This causes a failure of the type:

warning: package lsb-test-core-4.1.15-1.x86_64 is intended for a %{_target_platform} platform

When we detect an invalid platform, fall back and try to construct a new
platform name that may be valid based on the arch and os contents of the
package.  (This should only ever be needed by invalid or older RPM packages.)

(From OE-Core rev: 6513fa327aeb7e9fdd313290c205917952eed226)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle 2013-08-09 17:51:30 -05:00 committed by Richard Purdie
parent bef0aabeab
commit c8879e23ab
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch Normal file
View File

@ -0,0 +1,24 @@
Enable platform tag matching workaround in OE.
When installing some LSB packages the 'platform' field in the package
appears to be invalid. Instead of relying solely on the platform comparison
we also want to generate a perceived platform based on the valid rpm contents
of arch and os.
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Index: rpm-5.4.9/lib/depends.c
===================================================================
--- rpm-5.4.9.orig/lib/depends.c
+++ rpm-5.4.9/lib/depends.c
@@ -594,7 +594,7 @@ int rpmtsAddInstallElement(rpmts ts, Hea
platform = rpmExpand(arch, "-unknown-", os, NULL);
rc = rpmPlatformScore(platform, platpat, nplatpat);
-#if defined(RPM_VENDOR_MANDRIVA)
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE)
/*
* If no match on platform tag, we'll try again with arch tag
* in case platform tag is inconsistent with it, which is the case

3
meta/recipes-devtools/rpm/rpm_5.4.9.bb
View File

@ -86,7 +86,8 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
file://rpm-platform2.patch \
file://rpm-remove-sykcparse-decl.patch \
file://debugedit-segv.patch \
file://rpm-platform-file-fix.patch \
file://rpm-platform-file-fix.patch \
file://rpm-lsb-compatibility.patch \
"
# Uncomment the following line to enable platform score debugging