summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch34
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb1
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 0000000000..d1e4bf695c
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
@@ -0,0 +1,34 @@
1rpmfc.c: Always generate per-file information
2
3Even when the per-file dependency generate is disabled, we want to generate
4per file classification and other associated data.
5
6Note: this is a temporary workaround. Eventually we will want to have a way
7to seed per-file dependency and other information in order to generate a
8package from previously determined information.
9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11
12diff --git a/lib/rpmfc.c b/lib/rpmfc.c
13index 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;
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 9cfb3ab03b..c0e3208383 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
60 file://rpm-solvedb.patch \ 60 file://rpm-solvedb.patch \
61 file://rpm-tools-mtree-LDFLAGS.patch \ 61 file://rpm-tools-mtree-LDFLAGS.patch \
62 file://fprint-pointer-fix.patch \ 62 file://fprint-pointer-fix.patch \
63 file://rpm-fileclass.patch \
63 " 64 "
64 65
65# file://hdraddorappend.patch \ 66# file://hdraddorappend.patch \