diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-12-26 00:42:23 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-12-26 00:42:23 +0000 |
| commit | 5867852a8e90a31151acdd555a313ce660d4573c (patch) | |
| tree | 0564255a65f8e6b6ab1bbd5c58c85a686da22345 /packages/images/base-image.bb | |
| parent | 6e03f54929969450bcc876200c6aabcb7123cbe3 (diff) | |
| parent | 697b9b92a5931ad9042a282ccc0297c595d46644 (diff) | |
merge of '909c536d732a709ac1bbe82a546de7dade5fdf07'
and 'dafddd1d044d96ecf2e968c17c56e4f9f332240d'
Diffstat (limited to 'packages/images/base-image.bb')
| -rw-r--r-- | packages/images/base-image.bb | 10 |
1 files changed, 8 insertions, 2 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)} \ " |