diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-06-29 15:41:59 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 15:45:49 +0100 |
commit | ebfe9cd012b626e5b07612a88aeaf58b54446746 (patch) | |
tree | c03ba0e81a672dfc7bf5decbddead2df1a301c43 /meta/recipes-devtools/rpm/rpm | |
parent | 54da9dcc855690be79762e894eb5c347f2487d8e (diff) | |
download | poky-ebfe9cd012b626e5b07612a88aeaf58b54446746.tar.gz |
RPM: multilib file class/color
We need to include file class and file color in order to do the conflict
resolution required with a multilib design. This is normally disabled when
we don't use the internal dependency generator, patch enables it in
all cases.
(From OE-Core rev: 4c43ea3440ecca02d2945b02017f56a8de9ff808)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch new file mode 100644 index 0000000000..d1e4bf695c --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch | |||
@@ -0,0 +1,34 @@ | |||
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 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
11 | |||
12 | diff --git a/lib/rpmfc.c b/lib/rpmfc.c | ||
13 | index 0c3befd..9306999 100644 | ||
14 | --- a/lib/rpmfc.c | ||
15 | +++ b/lib/rpmfc.c | ||
16 | @@ -1692,7 +1692,6 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp) | ||
17 | /* ... then generate dependencies using %{__find_requires} et al. */ | ||
18 | rc = rpmfcGenerateDependsHelper(spec, pkg, fi); | ||
19 | printDeps(pkg->header); | ||
20 | - return rc; | ||
21 | } | ||
22 | |||
23 | /* Generate scriptlet Dependencies. */ | ||
24 | @@ -1720,8 +1719,8 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp) | ||
25 | av[ac] = NULL; | ||
26 | |||
27 | fc = rpmfcNew(); | ||
28 | - fc->skipProv = !pkg->autoProv; | ||
29 | - fc->skipReq = !pkg->autoReq; | ||
30 | + fc->skipProv = !pkg->autoProv || !internaldeps; | ||
31 | + fc->skipReq = !pkg->autoReq || !internaldeps; | ||
32 | fc->tracked = 0; | ||
33 | |||
34 | { const char * buildRootURL; | ||