diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-12-23 20:48:11 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-12-23 20:48:11 +0000 |
| commit | d4b46885736be704f97177ccfeaaf0a6bbbc890e (patch) | |
| tree | e06ad634a1e0e043630188d448fa0f4215186d60 | |
| parent | 3c39da0a0121f07f33d1acbfd6e93184f26d987e (diff) | |
nas-server-image: Made it honour machine features properly.
| -rw-r--r-- | packages/images/nas-server-image.bb | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/packages/images/nas-server-image.bb b/packages/images/nas-server-image.bb index d4a012c082..ca8f94e749 100644 --- a/packages/images/nas-server-image.bb +++ b/packages/images/nas-server-image.bb @@ -22,24 +22,30 @@ 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 \ - " - -IMAGE_INSTALL = "task-boot task-base-apex \ - ${DISTRO_SSH_DAEMON} \ - ${DISTRO_PACKAGE_MANAGER} \ - task-base-usbhost task-base-ext2 \ - ${IMAGE_INSTALL_TASKS} \ - " + task-nas-server-everything \ + " + +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 = "" |