diff options
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, 0 insertions, 28 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 deleted file mode 100644 index 200964f39d..0000000000 --- a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
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: Submitted [RPM5 maintainer] | ||
6 | |||
7 | Index: rpm-5.4.14/lib/rpmrc.c | ||
8 | =================================================================== | ||
9 | --- rpm-5.4.14.orig/lib/rpmrc.c | ||
10 | +++ rpm-5.4.14/lib/rpmrc.c | ||
11 | @@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * pl | ||
12 | #endif | ||
13 | } | ||
14 | |||
15 | +#if !defined(RPM_VENDOR_OE) /* 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 * pl | ||
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); | ||