X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-devtools%2Fopkg%2Fopkg%2F0011-opkg-allow-package-move-from-depends-to-recommends.patch;fp=meta-openvuplus%2Frecipes-devtools%2Fopkg%2Fopkg%2F0011-opkg-allow-package-move-from-depends-to-recommends.patch;h=0000000000000000000000000000000000000000;hp=5b5bc56b078299bf5993d216136b7655b53799e1;hb=ace0665511bd0f288a33f4aa1b6ab44c9a766c5c;hpb=89fe5e2d4ab32d17585aaf80418c7d31ed559a14;ds=sidebyside

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch
deleted file mode 100644
index 5b5bc56..0000000
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur trunk.org/libopkg/opkg_install.c trunk/libopkg/opkg_install.c
---- trunk.org/libopkg/opkg_install.c	2013-02-17 12:40:51.000000000 +0100
-+++ trunk/libopkg/opkg_install.c	2013-02-17 01:17:37.000000000 +0100
-@@ -366,11 +366,12 @@
- 
- 			for (k=0; k<count1; k++) {
- 				cd1 = &pkg->depends[k];
--				if (cd1->type != DEPEND)
-+				if (cd1->type != DEPEND && cd1->type != RECOMMEND)
- 					continue;
- 				for (l=0; l<cd1->possibility_count; l++) {
--					if (cd0->possibilities[j]
--					 == cd1->possibilities[l]) {
-+					if ( (cd0->type == cd1->type && cd0->possibilities[j] == cd1->possibilities[l]) ||
-+					     (cd0->type != cd1->type && !strcmp(cd0->possibilities[j]->pkg->name, cd1->possibilities[l]->pkg->name) )
-+					   ) {
- 						found = 1;
- 						break;
- 					}