[oe-commits] org.oe.dev base-image: depend on ext2/usbhost only if machine supports them - close #3499

[hrw commit]

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

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 4a084d17d8150e500fccc6f78c116ab863359656
ViewMTN: http://monotone.openembedded.org/revision/info/4a084d17d8150e500fccc6f78c116ab863359656
Files:
1
packages/images/base-image.bb
Diffs:

#
# mt diff -r10d336f749155351a4d975d4ce5b31de4a24f911 -r4a084d17d8150e500fccc6f78c116ab863359656
#
# 
# 
# patch "packages/images/base-image.bb"
#  from [b505988725f2bce81ebd364549ae0d4a1bcfca4f]
#    to [a1e5aad1ac0a18575912aad884dfdc89508d7d46]
# 
============================================================
--- packages/images/base-image.bb	b505988725f2bce81ebd364549ae0d4a1bcfca4f
+++ packages/images/base-image.bb	a1e5aad1ac0a18575912aad884dfdc89508d7d46
@@ -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"