29 lines
896 B
Diff
29 lines
896 B
Diff
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_OE) /* 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);
|