mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

RPM: multilib file class/color

Browse Source 
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>
This commit is contained in:
Mark Hatle
2011-06-29 15:41:59 -05:00
committed by Richard Purdie
parent 54da9dcc85
commit ebfe9cd012
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch Normal file
View File

@@ -0,0 +1,34 @@
rpmfc.c: Always generate per-file information
Even when the per-file dependency generate is disabled, we want to generate
per file classification and other associated data.
Note: this is a temporary workaround. Eventually we will want to have a way
to seed per-file dependency and other information in order to generate a
package from previously determined information.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
diff --git a/lib/rpmfc.c b/lib/rpmfc.c
index 0c3befd..9306999 100644
--- a/lib/rpmfc.c
+++ b/lib/rpmfc.c
@@ -1692,7 +1692,6 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp)
/* ... then generate dependencies using %{__find_requires} et al. */
rc = rpmfcGenerateDependsHelper(spec, pkg, fi);
printDeps(pkg->header);
- return rc;
}
/* Generate scriptlet Dependencies. */
@@ -1720,8 +1719,8 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp)
av[ac] = NULL;
fc = rpmfcNew();
- fc->skipProv = !pkg->autoProv;
- fc->skipReq = !pkg->autoReq;
+ fc->skipProv = !pkg->autoProv || !internaldeps;
+ fc->skipReq = !pkg->autoReq || !internaldeps;
fc->tracked = 0;
{ const char * buildRootURL;

1
meta/recipes-devtools/rpm/rpm_5.4.0.bb
View File

@@ -60,6 +60,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://rpm-solvedb.patch \
file://rpm-tools-mtree-LDFLAGS.patch \
file://fprint-pointer-fix.patch \
file://rpm-fileclass.patch \
"
# file://hdraddorappend.patch \