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:44:31 +0100 |
| commit | 4c43ea3440ecca02d2945b02017f56a8de9ff808 (patch) | |
| tree | 267f2a967d328a84772d154bc31d28e78338767c | |
| parent | 782499eaa817f1beecc0aea5bfa075196f8e2a53 (diff) | |
| download | openembedded-core-4c43ea3440ecca02d2945b02017f56a8de9ff808.tar.gz openembedded-core-4c43ea3440ecca02d2945b02017f56a8de9ff808.tar.bz2 openembedded-core-4c43ea3440ecca02d2945b02017f56a8de9ff808.tar.xz openembedded-core-4c43ea3440ecca02d2945b02017f56a8de9ff808.zip | |
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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 1 |
2 files changed, 35 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 000000000..d1e4bf695 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch @@ -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; diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 9cfb3ab03..c0e320838 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb @@ -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 \ |