From d4b46885736be704f97177ccfeaaf0a6bbbc890e Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 23 Dec 2007 20:48:11 +0000 Subject: nas-server-image: Made it honour machine features properly. --- packages/images/nas-server-image.bb | 38 +++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'packages') 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 = "" -- cgit v1.2.3 From e4504bf43b80eb1176c59436364f07449220474f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 24 Dec 2007 01:05:07 +0000 Subject: image-base: Removed task-distro-base and task-machine-base, and added yet-to-be-approved temporary DISTRO_FEED_CONFIGS variable. --- packages/images/base-image.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'packages') 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)} \ " -- cgit v1.2.3