diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2011-03-28 22:05:18 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-31 15:33:01 +0100 |
| commit | 7178a540b35a4a5e4a5e0546eb0c2207d2033cdf (patch) | |
| tree | b785de428b77f1f8449fe71d0c89cd6b24ba7854 /meta/recipes-extended | |
| parent | b9405ec0591aea3e1f7f3c779860d8e45589b0df (diff) | |
| download | openembedded-core-contrib-7178a540b35a4a5e4a5e0546eb0c2207d2033cdf.tar.gz | |
Fix sat-solver & RPM5 integration issue
From Michael Schroeder, fix the configuration of how RPM5 handles obsoletes
within the sat-solver.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver_git.bb | 3 |
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 @@ +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; + } + 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" 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 \ |