diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-12-30 18:38:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-13 09:43:21 +0000 |
commit | d0365f35303db3595688a6e5290677e02a72c54e (patch) | |
tree | 41a7989277ed93b4d48c7d331de742fa177fcda9 /meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch | |
parent | 2358e786ec8d1199d90e181eb5d8d00816f669b4 (diff) | |
download | openembedded-core-contrib-d0365f35303db3595688a6e5290677e02a72c54e.tar.gz |
rpm: remove 5.x recipe
Signed-off-by: Alexander Kanavin <alexander.kanavin@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, 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 @@ -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: Submitted [RPM5 maintainer] - -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); |