diff options
| author | Tom Rini <trini@embeddedalley.com> | 2009-04-22 21:26:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-04-22 21:26:14 -0400 |
| commit | 98dd5d2a73056f89ba0d7ff169e2c24f892bcb9e (patch) | |
| tree | 4d02406254983985c27e482311e5d197cbca033e | |
| parent | 3889422c46439421ff1692081c632209ea3f6493 (diff) | |
| parent | 1a36b908f19f0511e66dde773cc6ef359c450a2e (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/images/console-base-image.bb | 6 | ||||
| -rw-r--r-- | recipes/images/console-image.bb | 6 | ||||
| -rw-r--r-- | recipes/images/gnuradio-image.bb | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/recipes/images/console-base-image.bb b/recipes/images/console-base-image.bb index 887d37bdd9..93391c6776 100644 --- a/recipes/images/console-base-image.bb +++ b/recipes/images/console-base-image.bb @@ -4,13 +4,15 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" ANGSTROM_EXTRA_INSTALL ?= "" +SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}' + DEPENDS = "task-base \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ " IMAGE_INSTALL = "task-base \ ${ANGSTROM_EXTRA_INSTALL} \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ " IMAGE_LINGUAS = "" diff --git a/recipes/images/console-image.bb b/recipes/images/console-image.bb index 76cb8f034e..e30793b05f 100644 --- a/recipes/images/console-image.bb +++ b/recipes/images/console-image.bb @@ -4,13 +4,15 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" ANGSTROM_EXTRA_INSTALL ?= "" +SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}' + DEPENDS = "task-base-extended \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ " IMAGE_INSTALL = "task-base-extended \ ${ANGSTROM_EXTRA_INSTALL} \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ " export IMAGE_BASENAME = "console-image" diff --git a/recipes/images/gnuradio-image.bb b/recipes/images/gnuradio-image.bb index 5421584481..ce4f4997eb 100644 --- a/recipes/images/gnuradio-image.bb +++ b/recipes/images/gnuradio-image.bb @@ -4,13 +4,15 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" IMAGE_EXTRA_INSTALL ?= "" +SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}' + DEPENDS = "task-base-extended \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ " IMAGE_INSTALL = "task-base-extended \ ${IMAGE_EXTRA_INSTALL} \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ oprofile \ screen \ ntp ntp-bin \ |