diff options
author | Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2013-04-24 11:48:50 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-29 14:43:50 +0100 |
commit | 9263a2192ccf8ca513cbf7f2f88473e267e6b945 (patch) | |
tree | dd44dddd53c0269412f5d2449c48fb838dc73e61 /meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch | |
parent | f6244a9d3da7c301f19efc114c2aaf39e5eec299 (diff) | |
download | openembedded-core-9263a2192ccf8ca513cbf7f2f88473e267e6b945.tar.gz |
rpm: change arch scoring items
Don't add the first line of /etc/rpm/platform to the list of patterns
to match when computing an arch score, use it just for getting
information about the platform (cpu/vendor/os).
[YOCTO #3864]
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch new file mode 100644 index 0000000000..0f391d213a --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch @@ -0,0 +1,28 @@ +Don't add the first line of /etc/rpm/platform to the list of patterns +to match when computing an arch score, use it just for getting +information about the platform (cpu/vendor/os). Fixes #3864. + +Upstream-Status: Inappropriate [embedded specific] + +diff --git a/lib/rpmrc.c b/lib/rpmrc.c +index e676601..9140bbe 100644 +--- a/lib/rpmrc.c ++++ b/lib/rpmrc.c +@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * platform) + #endif + } + ++#if !defined(RPM_VENDOR_POKY) /* Skip the explicit-platform */ + #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ + /* do not use vendor and GNU attribution */ + p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); +@@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * platform) + #endif + xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre); + p = _free(p); +- ++#endif ++ + init_platform++; + } + rc = (init_platform ? RPMRC_OK : RPMRC_FAIL); |