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-14 14:42:16 +0000 |
commit | bbddf83f65f490c88130d794c53ff9e4c45d0693 (patch) | |
tree | bec599b6bbb2c0022f922c97601cb621e4b3f3b9 /meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch | |
parent | 27d56eeebd8197e359aae0a7ccac74cb55ff794d (diff) | |
download | poky-bbddf83f65f490c88130d794c53ff9e4c45d0693.tar.gz |
rpm: remove 5.x recipe
(From OE-Core rev: d0365f35303db3595688a6e5290677e02a72c54e)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch b/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch deleted file mode 100644 index a87518ba3a..0000000000 --- a/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Enable platform tag matching workaround in OE. | ||
2 | |||
3 | When installing some LSB packages the 'platform' field in the package | ||
4 | appears to be invalid. Instead of relying solely on the platform comparison | ||
5 | we also want to generate a perceived platform based on the valid rpm contents | ||
6 | of arch and os. | ||
7 | |||
8 | Upstream-Status: Submitted [RPM5 maintainer] | ||
9 | |||
10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
11 | |||
12 | Index: rpm-5.4.14/lib/depends.c | ||
13 | =================================================================== | ||
14 | --- rpm-5.4.14.orig/lib/depends.c | ||
15 | +++ rpm-5.4.14/lib/depends.c | ||
16 | @@ -595,7 +595,7 @@ int rpmtsAddInstallElement(rpmts ts, Hea | ||
17 | platform = rpmExpand(arch, "-unknown-", os, NULL); | ||
18 | |||
19 | rc = rpmPlatformScore(platform, platpat, nplatpat); | ||
20 | -#if defined(RPM_VENDOR_MANDRIVA) | ||
21 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) | ||
22 | /* | ||
23 | * If no match on platform tag, we'll try again with arch tag | ||
24 | * in case platform tag is inconsistent with it, which is the case | ||