From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 1 Oct 2010 07:59:56 +0000 (+0200)
Subject: om-gta0*: add qi qi-ubi to EXTRA_IMAGEDEPENDS, remove them from task-shr-feed
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=775d7c56bb2ee95cb650e91f10eee61dc8385cff;p=openembedded.git

om-gta0*: add qi qi-ubi to EXTRA_IMAGEDEPENDS, remove them from task-shr-feed

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 0890d7184b..b5ec35fd18 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -69,7 +69,7 @@ MKUBIFS_ARGS = "-m 512 -e 15360 -c 2376"
 UBINIZE_ARGS = "-m 512 -p 16KiB -s 512 -O 512"
 
 # build / upload tools
-EXTRA_IMAGEDEPENDS += "dfu-util-native"
+EXTRA_IMAGEDEPENDS += "dfu-util-native qi qi-ubi"
 
 module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
 
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 0b826ded82..480751597c 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -81,7 +81,7 @@ MKUBIFS_ARGS = "-m 2048 -e 126976 -c 2047"
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
 
 # build / upload tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native qi qi-ubi"
 
 module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
 #2.6.31 is using the same name as it was in gta01
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 477353c90c..e241b5127a 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r76"
+PR = "r77"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -277,8 +277,6 @@ RDEPENDS_${PN} += "\
 		make \
 		dnsmasq \
 		libsyncml \
-		qi \
-		qi-ubi \
 		wpa-gui \
 		iliwi \
 		gabriel \