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:45:06 +0100 |
commit | f2f835632c0ca5cc6cd3fcec91e4890ecb041698 (patch) | |
tree | 843a434166e5684706091b565bf9738cff5f6bc5 /meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch | |
parent | 3e79775a827a4256dd48160dcaaa98f5250c1499 (diff) | |
download | poky-f2f835632c0ca5cc6cd3fcec91e4890ecb041698.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]
(From OE-Core rev: 9263a2192ccf8ca513cbf7f2f88473e267e6b945)
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | Don't add the first line of /etc/rpm/platform to the list of patterns | ||
2 | to match when computing an arch score, use it just for getting | ||
3 | information about the platform (cpu/vendor/os). Fixes #3864. | ||
4 | |||
5 | Upstream-Status: Inappropriate [embedded specific] | ||
6 | |||
7 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c | ||
8 | index e676601..9140bbe 100644 | ||
9 | --- a/lib/rpmrc.c | ||
10 | +++ b/lib/rpmrc.c | ||
11 | @@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * platform) | ||
12 | #endif | ||
13 | } | ||
14 | |||
15 | +#if !defined(RPM_VENDOR_POKY) /* Skip the explicit-platform */ | ||
16 | #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ | ||
17 | /* do not use vendor and GNU attribution */ | ||
18 | p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); | ||
19 | @@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * platform) | ||
20 | #endif | ||
21 | xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre); | ||
22 | p = _free(p); | ||
23 | - | ||
24 | +#endif | ||
25 | + | ||
26 | init_platform++; | ||
27 | } | ||
28 | rc = (init_platform ? RPMRC_OK : RPMRC_FAIL); | ||