diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-24 08:26:39 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-24 08:26:39 +0000 |
| commit | 608343b79b2001cadb5c3e7902321b02492d0e0e (patch) | |
| tree | 97e0784d5f2ccad69d413a4111eb6a099146daaa /packages/images | |
| parent | c22243da28c363194428c790ca5248c4a6466770 (diff) | |
| parent | f71b8dbf0011cb5c64897109a3433f3b9df54d24 (diff) | |
merge of 'b27a32bfcc21a1d26ba62f18397b781bbfc0133c'
and 'c4691d132cd9904569c41d8d59f1a8a1989ddf47'
Diffstat (limited to 'packages/images')
| -rw-r--r-- | packages/images/base-image.bb | 10 | ||||
| -rw-r--r-- | packages/images/nas-server-image.bb | 38 |
2 files changed, 30 insertions, 18 deletions
diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb index 36760ec499..9afa682d2c 100644 --- a/packages/images/base-image.bb +++ b/packages/images/base-image.bb @@ -17,22 +17,28 @@ # image is intended to be distro-agnostic. DISTRO_SSH_DAEMON ?= "dropbear" + DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral" +# FIXME: We need a distro-indendent way of specifying feed configs. +# Once the RFC for the DISTRO_FEED_CONFIGS variable name is approved, +# we can remove this default definition and set it in the distro config. +DISTRO_FEED_CONFIGS ?= "${ANGSTROM_FEED_CONFIGS}" + DEPENDS = "\ task-boot \ - task-distro-base task-machine-base \ ${DISTRO_SSH_DAEMON} \ ${DISTRO_PACKAGE_MANAGER} \ + ${DISTRO_FEED_CONFIGS} \ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ " IMAGE_INSTALL = "\ task-boot \ - task-distro-base task-machine-base \ ${DISTRO_SSH_DAEMON} \ ${DISTRO_PACKAGE_MANAGER} \ + ${DISTRO_FEED_CONFIGS} \ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ " 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 = "" |