diff options
| author |   Koen Kooi <koen@openembedded.org> | 2010-02-17 19:14:26 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-02-17 19:14:26 +0100 |
| commit | 8679a8574893ac8cd3beeebe2e62084b94660999 (patch) | |
| tree | f6b9c9d4ab0c8144deaae4108a3fc2bb776b21e6 /recipes/images | |
| parent | 80db39feb76a6afaf1eb2c4dd8311fc21e4c2d6f (diff) | |
| download | openembedded-8679a8574893ac8cd3beeebe2e62084b94660999.tar.gz | |
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.
Diffstat (limited to 'recipes/images')
| -rw-r--r-- | recipes/images/angstrom-console-base-image.bb | 10 | ||||
| -rw-r--r-- | recipes/images/console-base-image.bb | 9 |
2 files changed, 3 insertions, 16 deletions
diff --git a/recipes/images/angstrom-console-base-image.bb b/recipes/images/angstrom-console-base-image.bb deleted file mode 100644 index 2fdeecb351..0000000000 --- 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 2999d1c9c6..9bd50316b5 100644 --- 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} \ " |