diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-03-28 22:05:18 -0500 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-05-06 17:44:22 -0700 |
commit | c36361ed5a67ca58f845379e4be7ecc162143769 (patch) | |
tree | 1b5146bed441539c1d8b2f5cb11d5b6b4550ddca | |
parent | 60ab27d71ba8e6bba49d1158d2668d6c739e2840 (diff) | |
download | poky-c36361ed5a67ca58f845379e4be7ecc162143769.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.patch | 20 | ||||
-rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver_git.bb | 1 |
2 files changed, 21 insertions, 0 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 @@ | |||
1 | Fix obsolete settings with RPM5. | ||
2 | |||
3 | The following patch is from Michael Schroeder <mls@suse.de> | ||
4 | |||
5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
6 | |||
7 | diff -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 9892d14ecc..a6937763cb 100644 --- a/meta/recipes-extended/sat-solver/sat-solver_git.bb +++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb | |||
@@ -11,6 +11,7 @@ PR = "r8" | |||
11 | 11 | ||
12 | SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \ | 12 | SRC_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://sat-solver_poky.patch \ | 17 | file://sat-solver_poky.patch \ |