Revert "recipes/images/console-base-image.bb: factor out Angstrom-specific bits"

This violates the principal of least surprise and invalidates documentation. If you're touching a recipe at least make sure the creator/maintainer agrees with your changes. Which I don't, as I've already stated

This reverts commit 80db39feb76a6afaf1eb2c4dd8311fc21e4c2d6f.

diff --git a/recipes/images/angstrom-console-base-image.bb b/recipes/images/angstrom-console-base-image.bb
deleted file mode 100644 (file)
index 2fdeecb..0000000
--- a/recipes/images/angstrom-console-base-image.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require console-base-image.bb
-
-#Angstrom bootstrap image
-ANGSTROM_EXTRA_INSTALL ?= ""
-
-IMAGE_INSTALL = "task-base \
-           ${ANGSTROM_EXTRA_INSTALL} \
-           ${SPLASH} \
-           ${ZZAPSPLASH} \
-           "

diff --git a/recipes/images/console-base-image.bb b/recipes/images/console-base-image.bb
index 2999d1c..9bd5031 100644 (file)
--- a/recipes/images/console-base-image.bb
+++ b/recipes/images/console-base-image.bb
@@ -1,11 +1,8 @@
-# bootstrap image
-#
-# the Angstrom-specific bits that were originally part of this image
-# definition have been moved to angstrom-console-base-image.bb
+#Angstrom bootstrap image
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
-IMAGE_EXTRA_INSTALL ?= ""
+ANGSTROM_EXTRA_INSTALL ?= ""
 
 ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}'
 
@@ -15,7 +12,7 @@ DEPENDS = "task-base \
           "
 
 IMAGE_INSTALL = "task-base \
-           ${IMAGE_EXTRA_INSTALL} \
+           ${ANGSTROM_EXTRA_INSTALL} \
            ${SPLASH} \
            ${ZZAPSPLASH} \
            "