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-fileclass.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-fileclass.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch deleted file mode 100644 index b1db6fff72..0000000000 --- a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | rpmfc.c: Always generate per-file information | ||
2 | |||
3 | Even when the per-file dependency generate is disabled, we want to generate | ||
4 | per file classification and other associated data. | ||
5 | |||
6 | Note: this is a temporary workaround. Eventually we will want to have a way | ||
7 | to seed per-file dependency and other information in order to generate a | ||
8 | package from previously determined information. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
13 | |||
14 | Index: rpm-5.4.14/lib/rpmfc.c | ||
15 | =================================================================== | ||
16 | --- rpm-5.4.14.orig/lib/rpmfc.c | ||
17 | +++ rpm-5.4.14/lib/rpmfc.c | ||
18 | @@ -1734,7 +1734,6 @@ rpmRC rpmfcGenerateDepends(void * _spec, | ||
19 | /* ... then generate dependencies using %{__find_requires} et al. */ | ||
20 | rc = rpmfcGenerateDependsHelper(spec, pkg, fi); | ||
21 | printDeps(pkg->header); | ||
22 | - return rc; | ||
23 | } | ||
24 | |||
25 | /* Generate scriptlet Dependencies. */ | ||
26 | @@ -1762,8 +1761,8 @@ rpmRC rpmfcGenerateDepends(void * _spec, | ||
27 | av[ac] = NULL; | ||
28 | |||
29 | fc = rpmfcNew(); | ||
30 | - fc->skipProv = !pkg->autoProv; | ||
31 | - fc->skipReq = !pkg->autoReq; | ||
32 | + fc->skipProv = !pkg->autoProv || !internaldeps; | ||
33 | + fc->skipReq = !pkg->autoReq || !internaldeps; | ||
34 | fc->tracked = 0; | ||
35 | |||
36 | { const char * buildRootURL; | ||