| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Enable platform tag matching workaround in OE. |
| 2 | |
| 3 | When installing some LSB packages the 'platform' field in the package |
| 4 | appears to be invalid. Instead of relying solely on the platform comparison |
| 5 | we also want to generate a perceived platform based on the valid rpm contents |
| 6 | of arch and os. |
| 7 | |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8 | Upstream-Status: Submitted [RPM5 maintainer] |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9 | |
| 10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 11 | |
| 12 | Index: rpm-5.4.14/lib/depends.c |
| 13 | =================================================================== |
| 14 | --- rpm-5.4.14.orig/lib/depends.c |
| 15 | +++ rpm-5.4.14/lib/depends.c |
| 16 | @@ -595,7 +595,7 @@ int rpmtsAddInstallElement(rpmts ts, Hea |
| 17 | platform = rpmExpand(arch, "-unknown-", os, NULL); |
| 18 | |
| 19 | rc = rpmPlatformScore(platform, platpat, nplatpat); |
| 20 | -#if defined(RPM_VENDOR_MANDRIVA) |
| 21 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) |
| 22 | /* |
| 23 | * If no match on platform tag, we'll try again with arch tag |
| 24 | * in case platform tag is inconsistent with it, which is the case |