From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 20 Dec 2007 13:44:49 +0000 (+0000)
Subject: base-image: depend on ext2/usbhost only if machine supports them - close #3499
X-Git-Tag: Release-2010-05/1~8130
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e32b9ba8ea0ae8ed77f69d852658599d2e497dfa;p=openembedded.git

base-image: depend on ext2/usbhost only if machine supports them - close #3499
---

diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb
index 20a5fd9445..36760ec499 100644
--- a/packages/images/base-image.bb
+++ b/packages/images/base-image.bb
@@ -24,7 +24,8 @@ DEPENDS = "\
 	task-distro-base task-machine-base \
 	${DISTRO_SSH_DAEMON} \
 	${DISTRO_PACKAGE_MANAGER} \
-	task-base-usbhost task-base-ext2 \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
 	"
 
 IMAGE_INSTALL = "\
@@ -32,7 +33,8 @@ IMAGE_INSTALL = "\
 	task-distro-base task-machine-base \
 	${DISTRO_SSH_DAEMON} \
 	${DISTRO_PACKAGE_MANAGER} \
-	task-base-usbhost task-base-ext2 \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
 	"
 
 export IMAGE_BASENAME = "base-image"