[oe-commits] org.oe.dev nas-server-image: Made it honour machine features properly.

[rwhitby commit]

nas-server-image: Made it honour machine features properly.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 18890ff50a360315f132ff446f7a44ae0dcb4061
ViewMTN: http://monotone.openembedded.org/revision/info/18890ff50a360315f132ff446f7a44ae0dcb4061
Files:
1
packages/images/nas-server-image.bb
Diffs:

#
# mt diff -rec60010395d1ec561cf9377a93140bd2f2f31df4 -r18890ff50a360315f132ff446f7a44ae0dcb4061
#
# 
# 
# patch "packages/images/nas-server-image.bb"
#  from [4a3d731bbbd71dc410b89cd730fedb91cfa12035]
#    to [560048e8fa92ea93876cac92e66f0d4241079ad6]
# 
============================================================
--- packages/images/nas-server-image.bb	4a3d731bbbd71dc410b89cd730fedb91cfa12035
+++ packages/images/nas-server-image.bb	560048e8fa92ea93876cac92e66f0d4241079ad6
@@ -22,24 +22,30 @@ DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-col
 DISTRO_SSH_DAEMON ?= "dropbear"
 DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
 
-DEPENDS = "task-boot task-base-apex \
-            task-distro-base task-machine-base \
-            ${DISTRO_SSH_DAEMON} \
-            ${DISTRO_PACKAGE_MANAGER} \
-            task-base-usbhost task-base-ext2 \
-	    task-nas-server-everything \
-           "
+DEPENDS = "\
+	task-boot \
+	${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
+	task-distro-base task-machine-base \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+	task-nas-server-everything \
+	"
 
 IMAGE_INSTALL_TASKS = "\
-            task-nas-server-everything \
-           "
+	task-nas-server-everything \
+	"
 
-IMAGE_INSTALL = "task-boot task-base-apex \
-            ${DISTRO_SSH_DAEMON} \
-            ${DISTRO_PACKAGE_MANAGER} \
-            task-base-usbhost task-base-ext2 \
-            ${IMAGE_INSTALL_TASKS} \
-	   "
+IMAGE_INSTALL = "\
+	task-boot \
+	${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+	${IMAGE_INSTALL_TASKS} \
+	"
 
 export IMAGE_BASENAME = "nas-server-image"
 IMAGE_LINGUAS = ""