sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Mark Hatle 2011-03-28 22:05:18 -05:00 committed by Richard Purdie
parent 2ac89c2447
commit 133f7e8cdd
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch Normal file
View File

@ -0,0 +1,20 @@
Fix obsolete settings with RPM5.
The following patch is from Michael Schroeder <mls@suse.de>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
diff -ur git.orig/src/pool.c git/src/pool.c
--- git.orig/src/pool.c 2011-03-25 15:49:34.885834194 -0500
+++ git/src/pool.c 2011-03-28 10:55:13.138786524 -0500
@@ -70,6 +70,10 @@
pool->disttype = DISTTYPE_DEB;
# endif
#endif
+#ifdef RPM5
+ pool->obsoleteusesprovides = 1;
+ pool->implicitobsoleteusesprovides = 1;
+#endif
return pool;
}

3
meta/recipes-extended/sat-solver/sat-solver_git.bb
View File

@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
DEPENDS = "libcheck rpm zlib expat db"
PV = "0.0-git${SRCPV}"
PR = "r6"
PR = "r7"
SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
file://sat-solver_rpm5.patch \
file://sat-solver_obsolete.patch \
file://cmake.patch \
file://db5.patch \
file://builtin-arch.patch;apply=no \