From: Denys Dmytriyenko <denis@denix.org>
Date: Mon, 15 Mar 2010 17:10:26 +0000 (+0000)
Subject: opkg: fix global depends on openssl, even in -nogpg/-nocurl
X-Git-Tag: Release-2010-05/1~340^2~128^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a354bababcb3df9935ebe652a2df353b7205ad9f;p=openembedded.git

opkg: fix global depends on openssl, even in -nogpg/-nocurl

Fixes the problem, introduced by 8c1731d818c89a291f80940c1912587ff9ce46b7,
where openssl is added with DEPENDS_append override, preventing -nogpg and
-nocurl variants from clearing the DEPENDS, when they include opkg_svn.bb
file, thus forcing them to depend on openssl too.

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Chris Larson <clarson@kergoth.com>
---

diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index 4442102b51..9a3d3dc71b 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -2,9 +2,9 @@ DESCRIPTION = "Opkg Package Manager"
 DESCRIPTION_libopkg = "Opkg Package Manager Library"
 SECTION = "base"
 LICENSE = "GPLv2"
-DEPENDS = "curl gpgme"
+DEPENDS = "curl gpgme openssl"
 PV = "0.1.6+svnr${SRCPV}"
-INC_PR = "r20"
+INC_PR = "r21"
 
 FILESPATHPKG =. "opkg:"
 
diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb
index 4945260065..5138458498 100644
--- a/recipes/opkg/opkg_svn.bb
+++ b/recipes/opkg/opkg_svn.bb
@@ -1,7 +1,5 @@
 require opkg.inc
 
-DEPENDS_append = " openssl"
-
 PR = "${INC_PR}"
 
 PROVIDES =+ "virtual/update-alternatives"