Update openembedded-core / meta-openembedded / bitbake (1.25.0)

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-devtools / opkg / opkg / 0002-Don-t-mark-Conflicts-as-Depends.patch

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch
deleted file mode 100644 (file)
index 9e122de..0000000
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8c00c6be3723a0dcf05a10b5aba8c1c3b1fe4cf7 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Wed, 16 May 2012 23:29:04 +0200
-Subject: [PATCH 02/10] Don't mark Conflicts as Depends
-
-- Fixes 'whatconflicts' sub-command.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/pkg_depends.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index 1e14d1f..a61e80e 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -609,8 +609,8 @@ void buildConflicts(pkg_t * pkg)
- 
-     conflicts = pkg->conflicts = xcalloc(pkg->conflicts_count, sizeof(compound_depend_t));
-     for (i = 0; i < pkg->conflicts_count; i++) {
--       conflicts->type = CONFLICTS;
-        parseDepends(conflicts, pkg->conflicts_str[i]);
-+       conflicts->type = CONFLICTS;
-        free(pkg->conflicts_str[i]);
-        conflicts++;
-     }
--- 
-1.7.9.5
-