summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-03-28 22:05:18 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-31 22:02:45 +0100
commit133f7e8cdd5a2b8f205ae1c2128f2e4fb6eb2cf4 (patch)
tree7ca887c5f82dab8663600648fc2cea3be728ae9d
parent2ac89c24475e566eb5f83aaeaacaa88f2518d05b (diff)
downloadpoky-133f7e8cdd5a2b8f205ae1c2128f2e4fb6eb2cf4.tar.gz
Fix sat-solver & RPM5 integration issue
From Michael Schroeder, fix the configuration of how RPM5 handles obsoletes within the sat-solver. (From OE-Core rev: 7178a540b35a4a5e4a5e0546eb0c2207d2033cdf) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch20
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver_git.bb3
2 files changed, 22 insertions, 1 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch
new file mode 100644
index 0000000000..768505780b
--- /dev/null
+++ b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch
@@ -0,0 +1,20 @@
1Fix obsolete settings with RPM5.
2
3The following patch is from Michael Schroeder <mls@suse.de>
4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6
7diff -ur git.orig/src/pool.c git/src/pool.c
8--- git.orig/src/pool.c 2011-03-25 15:49:34.885834194 -0500
9+++ git/src/pool.c 2011-03-28 10:55:13.138786524 -0500
10@@ -70,6 +70,10 @@
11 pool->disttype = DISTTYPE_DEB;
12 # endif
13 #endif
14+#ifdef RPM5
15+ pool->obsoleteusesprovides = 1;
16+ pool->implicitobsoleteusesprovides = 1;
17+#endif
18 return pool;
19 }
20
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index ba5af67f70..33bf9392e2 100644
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
7DEPENDS = "libcheck rpm zlib expat db" 7DEPENDS = "libcheck rpm zlib expat db"
8 8
9PV = "0.0-git${SRCPV}" 9PV = "0.0-git${SRCPV}"
10PR = "r6" 10PR = "r7"
11 11
12SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \ 12SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
13 file://sat-solver_rpm5.patch \ 13 file://sat-solver_rpm5.patch \
14 file://sat-solver_obsolete.patch \
14 file://cmake.patch \ 15 file://cmake.patch \
15 file://db5.patch \ 16 file://db5.patch \
16 file://builtin-arch.patch;apply=no \ 17 file://builtin-arch.patch;apply=no \