summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2010-09-29 12:40:36 -0500
committerSaul Wold <Saul.Wold@intel.com>2010-09-30 10:05:43 -0700
commitce373c7cc330562594da95ba14c463acb2c88f6e (patch)
treedc561db5f59cffdc7416fdbd27e243448ac215fe /meta
parentfad896d4ea82b1cabcabbdf446a0c237f0005502 (diff)
downloadpoky-ce373c7cc330562594da95ba14c463acb2c88f6e.tar.gz
rpm_5.1.10: Disable dependency loop message
[BUGID #332] Disable the dependency loop message that looked like an error had occured. This is really a debug message. Also remove the "remove: " debug message about which side of the dep loop it is removing to resolve the circular dependency. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch38
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.1.10.bb1
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch
new file mode 100644
index 0000000000..1f0dbcbef9
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch
@@ -0,0 +1,38 @@
1The LOOP: ... messages appear to be errors, but in reality they are
2simply debug messages that indicate there is one or more dependency
3loop within the system.
4
5Due to Poky packages owning all of the directories they use, a large
6number of depedency loops may be present. So disabling this message
7seems to make the most sense.
8
9Signed-off-by: mark.hatle@windriver.com
10
11diff -ur rpm-5.1.10.orig/lib/depends.c rpm-5.1.10/lib/depends.c
12--- rpm-5.1.10.orig/lib/depends.c 2010-09-29 12:23:48.307048065 -0500
13+++ rpm-5.1.10/lib/depends.c 2010-09-29 12:33:23.306022259 -0500
14@@ -2044,9 +2044,11 @@
15 * Attempt to unravel a dependency loop by eliminating Requires's.
16 */
17 if (zap) {
18+#if 0
19 rpmlog(msglvl,
20 _("removing %s \"%s\" from tsort relations.\n"),
21 (rpmteNEVRA(p) ? rpmteNEVRA(p) : "???"), dp);
22+#endif
23 rpmteTSI(p)->tsi_count--;
24 if (tsi_prev) tsi_prev->tsi_next = tsi->tsi_next;
25 tsi->tsi_next = NULL;
26@@ -2676,10 +2678,12 @@
27 /* Unchain predecessor loop. */
28 rpmteTSI(p)->tsi_chain = NULL;
29
30+#if 0
31 if (!printed) {
32 rpmlog(msglvl, _("LOOP:\n"));
33 printed = 1;
34 }
35+#endif
36
37 /* Find (and destroy if co-requisite) "q <- p" relation. */
38 dp = zapRelation(q, p, 1, &nzaps, msglvl);
diff --git a/meta/recipes-devtools/rpm/rpm_5.1.10.bb b/meta/recipes-devtools/rpm/rpm_5.1.10.bb
index e5ccf8e99d..cbae3f3b31 100644
--- a/meta/recipes-devtools/rpm/rpm_5.1.10.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.1.10.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.1/SNAPSHOT/${BPN}-${PV}.tar.gz \
12 file://rpm-autoconf.patch \ 12 file://rpm-autoconf.patch \
13 file://remove-compiled-tests.patch;apply=no \ 13 file://remove-compiled-tests.patch;apply=no \
14 file://perfile_rpmdeps.sh \ 14 file://perfile_rpmdeps.sh \
15 file://rpm-no-loop.patch \
15 " 16 "
16inherit autotools gettext 17inherit autotools gettext
17 18