From 972dcfcdbfe75dcfeb777150c136576cf1a71e99 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 9 Oct 2015 22:59:03 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- .../rpm/rpm/rpm-platform-file-fix.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch') 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..f26a6e79da --- /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] + +Index: rpm-5.4.14/lib/rpmrc.c +=================================================================== +--- rpm-5.4.14.orig/lib/rpmrc.c ++++ rpm-5.4.14/lib/rpmrc.c +@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * pl + #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 * pl + #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); -- cgit v1.2.3-54-g00ecf