[oe-commits] org.oe.dev image-base: Removed task-distro-base and task-machine-base, and added yet-to-be-approved temporary DISTRO_FEED_CONFIGS variable.

[rwhitby commit]

image-base: Removed task-distro-base and task-machine-base, and added yet-to-be-approved temporary DISTRO_FEED_CONFIGS variable.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 74c545ed021de12395e8e037da79100e4b8f5a18
ViewMTN: http://monotone.openembedded.org/revision/info/74c545ed021de12395e8e037da79100e4b8f5a18
Files:
1
packages/images/base-image.bb
Diffs:

#
# mt diff -r18890ff50a360315f132ff446f7a44ae0dcb4061 -r74c545ed021de12395e8e037da79100e4b8f5a18
#
# 
# 
# patch "packages/images/base-image.bb"
#  from [a1e5aad1ac0a18575912aad884dfdc89508d7d46]
#    to [9c81aebd2963f50d6b9de4476bda3726a21b502b]
# 
============================================================
--- packages/images/base-image.bb	a1e5aad1ac0a18575912aad884dfdc89508d7d46
+++ packages/images/base-image.bb	9c81aebd2963f50d6b9de4476bda3726a21b502b
@@ -17,22 +17,28 @@ DISTRO_SSH_DAEMON ?= "dropbear"
 # 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)} \
 	"