[oe-commits] Denys Dmytriyenko : opkg: fix global depends on openssl, even in -nogpg/ -nocurl

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a354bababcb3df9935ebe652a2df353b7205ad9f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a354bababcb3df9935ebe652a2df353b7205ad9f

Author: Denys Dmytriyenko <denis at denix.org>
Date:   Mon Mar 15 17:10:26 2010 +0000

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 at denix.org>
Acked-by: Chris Larson <clarson at kergoth.com>

---

 recipes/opkg/opkg.inc    |    4 ++--
 recipes/opkg/opkg_svn.bb |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index 4442102..9a3d3dc 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 4945260..5138458 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"