[oe-commits] Paul Eggleton : opie-packagemanager: move DEPENDS value to .inc file

[git version control]

Module: openembedded.git
Branch: master
Commit: f813ec8fdb80660137bafbe2e6cf4143a602e875
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=f813ec8fdb80660137bafbe2e6cf4143a602e875

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sat Jun  4 12:45:52 2011 +0100

opie-packagemanager: move DEPENDS value to .inc file

Small tidy-up now 1.2.4 has been removed.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 .../opie-packagemanager/opie-packagemanager.inc    |    5 +++--
 .../opie-packagemanager_1.2.5.bb                   |    6 ------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/recipes/opie-packagemanager/opie-packagemanager.inc b/recipes/opie-packagemanager/opie-packagemanager.inc
index 39a5b3a..a6b5ca1 100644
--- a/recipes/opie-packagemanager/opie-packagemanager.inc
+++ b/recipes/opie-packagemanager/opie-packagemanager.inc
@@ -2,14 +2,15 @@ DESCRIPTION = "Opie Package Manager"
 SECTION = "opie/settings"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "libipkg"
+DEPENDS = "opkg"
 APPNAME = "packagemanager"
 
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-EXTRA_QMAKEVARS_PRE += "LIBIPK_INC_DIR=${STAGING_INCDIR}/libipkg"
+EXTRA_QMAKEVARS_PRE += "LIBIPK_INC_DIR=${STAGING_INCDIR}/libopkg"
+export CONFIG_LIBOPK_DEP=y
 
 do_install() {
     install -d ${D}${palmtopdir}/pics/${APPNAME}
diff --git a/recipes/opie-packagemanager/opie-packagemanager_1.2.5.bb b/recipes/opie-packagemanager/opie-packagemanager_1.2.5.bb
index 6a3181e..03745b1 100644
--- a/recipes/opie-packagemanager/opie-packagemanager_1.2.5.bb
+++ b/recipes/opie-packagemanager/opie-packagemanager_1.2.5.bb
@@ -2,12 +2,6 @@ require ${PN}.inc
 
 PR = "r0"
 
-DEPENDS = "opkg"
-
-EXTRA_QMAKEVARS_PRE += "LIBIPK_INC_DIR=${STAGING_INCDIR}/libopkg"
-
-export CONFIG_LIBOPK_DEP=y
-
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_noncore_settings_${APPNAME}.tar.bz2;name=split_noncore_settings_appname \
            http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics \
            http://sources.openembedded.org/opie-1.2.5-split_apps.tar.bz2;name=split_apps"