summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-12-24 01:05:07 +0000
committerRod Whitby <rod@whitby.id.au>2007-12-24 01:05:07 +0000
commite4504bf43b80eb1176c59436364f07449220474f (patch)
tree3af5c56b515038365a5a4c049ef87851be6a215a /packages
parentd4b46885736be704f97177ccfeaaf0a6bbbc890e (diff)
image-base: Removed task-distro-base and task-machine-base, and added yet-to-be-approved temporary DISTRO_FEED_CONFIGS variable.
Diffstat (limited to 'packages')
-rw-r--r--packages/images/base-image.bb10
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)} \
"