diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-11-22 21:10:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-24 15:12:30 +0000 |
commit | 002f48337737a746116fa69cb89c9a9e6b61bd92 (patch) | |
tree | 29e97e315938a3497f100fe1051ac69ea49f940f /meta/recipes-devtools/opkg/opkg/0010-pkg_depends-fix-version_constraints_satisfied.patch | |
parent | 9f836a4595dc4524ebd95db02165ef28dda51010 (diff) | |
download | poky-002f48337737a746116fa69cb89c9a9e6b61bd92.tar.gz |
opkg: bump SRCREV and drop applied patches
* only change upstream which wasn't in oe-core is
http://code.google.com/p/opkg/source/detail?r=635
and added testcase for that
(From OE-Core rev: 5fd1d515db5966f45a3b2f936f3c4225f59186e2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/0010-pkg_depends-fix-version_constraints_satisfied.patch')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/0010-pkg_depends-fix-version_constraints_satisfied.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/0010-pkg_depends-fix-version_constraints_satisfied.patch b/meta/recipes-devtools/opkg/opkg/0010-pkg_depends-fix-version_constraints_satisfied.patch deleted file mode 100644 index a13d6585c3..0000000000 --- a/meta/recipes-devtools/opkg/opkg/0010-pkg_depends-fix-version_constraints_satisfied.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From e9add8fe4a63ef14aba8bd238ddde84d5470b611 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 29 Sep 2012 18:56:01 +0200 | ||
4 | Subject: [PATCH 10/10] pkg_depends: fix version_constraints_satisfied | ||
5 | |||
6 | * with | ||
7 | Package: a | ||
8 | Version: 1 | ||
9 | and | ||
10 | Conflicts: a (<< 1) | ||
11 | we have comparison == 0, but constraint EARLIER is not satisfied! | ||
12 | |||
13 | Upstream-Status: Submitted | ||
14 | http://code.google.com/p/opkg/issues/detail?id=94 | ||
15 | |||
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
17 | --- | ||
18 | libopkg/pkg_depends.c | 3 ++- | ||
19 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c | ||
22 | index 3dd8240..be81b7f 100644 | ||
23 | --- a/libopkg/pkg_depends.c | ||
24 | +++ b/libopkg/pkg_depends.c | ||
25 | @@ -464,7 +464,8 @@ int version_constraints_satisfied(depend_t * depends, pkg_t * pkg) | ||
26 | else if((depends->constraint == LATER) && | ||
27 | (comparison > 0)) | ||
28 | return 1; | ||
29 | - else if(comparison == 0) | ||
30 | + else if((depends->constraint == EQUAL) && | ||
31 | + (comparison == 0)) | ||
32 | return 1; | ||
33 | else if((depends->constraint == LATER_EQUAL) && | ||
34 | (comparison >= 0)) | ||
35 | -- | ||
36 | 1.7.12 | ||
37 | |||