diff options
| author | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-04-27 17:47:41 +0200 |
|---|---|---|
| committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-04-27 17:47:41 +0200 |
| commit | 691fd364dc741a8df339a1c3f74d941589ebaa99 (patch) | |
| tree | 17aca55ad50553f58defacb24c377cd8777cf966 /recipes/images | |
| parent | 413cc98aa563c9e6104d1104d5b24987ab9d12f8 (diff) | |
| parent | eee57a831f63162a5c40c7ed53805f8d78a058bf (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/images')
| -rw-r--r-- | recipes/images/console-base-image.bb | 12 | ||||
| -rw-r--r-- | recipes/images/console-image.bb | 12 | ||||
| -rw-r--r-- | recipes/images/distcc-master-image.bb | 26 | ||||
| -rw-r--r-- | recipes/images/gnuradio-image.bb | 12 | ||||
| -rw-r--r-- | recipes/images/minimal-image.bb | 2 |
5 files changed, 51 insertions, 13 deletions
diff --git a/recipes/images/console-base-image.bb b/recipes/images/console-base-image.bb index 887d37bdd9..d25a4fc79e 100644 --- a/recipes/images/console-base-image.bb +++ b/recipes/images/console-base-image.bb @@ -4,16 +4,20 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" ANGSTROM_EXTRA_INSTALL ?= "" +SPLASH ?= "" +ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}' + DEPENDS = "task-base \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ + ${ZZAPSPLASH} \ " IMAGE_INSTALL = "task-base \ ${ANGSTROM_EXTRA_INSTALL} \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ - " + ${SPLASH} \ + ${ZZAPSPLASH} \ + " IMAGE_LINGUAS = "" inherit image - diff --git a/recipes/images/console-image.bb b/recipes/images/console-image.bb index 76cb8f034e..9707881402 100644 --- a/recipes/images/console-image.bb +++ b/recipes/images/console-image.bb @@ -4,17 +4,21 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" ANGSTROM_EXTRA_INSTALL ?= "" +SPLASH ?= "" +ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}' + DEPENDS = "task-base-extended \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ + ${ZZAPSPLASH} \ " IMAGE_INSTALL = "task-base-extended \ ${ANGSTROM_EXTRA_INSTALL} \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ - " + ${SPLASH} \ + ${ZZAPSPLASH} \ + " export IMAGE_BASENAME = "console-image" IMAGE_LINGUAS = "" inherit image - diff --git a/recipes/images/distcc-master-image.bb b/recipes/images/distcc-master-image.bb new file mode 100644 index 0000000000..a11cce85da --- /dev/null +++ b/recipes/images/distcc-master-image.bb @@ -0,0 +1,26 @@ +#Angstrom distcc image + +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" + +DEPENDS = "bridge-utils task-boot distcc task-native-sdk" + +IMAGE_INSTALL = "task-base \ + distcc \ + task-native-sdk \ + bridge-utils \ + task-proper-tools \ + mtd-utils \ + wireless-tools \ + iptables \ + ncurses-dev \ + distcc-distmon-gnome \ + angstrom-gpe-task-base \ + e-wm-config-angstrom" + +export IMAGE_BASENAME = "distcc-master-image" +IMAGE_LINGUAS = "" + +IMAGE_FSTYPES += "ubi" + +inherit image + diff --git a/recipes/images/gnuradio-image.bb b/recipes/images/gnuradio-image.bb index 5421584481..53e79b8a1a 100644 --- a/recipes/images/gnuradio-image.bb +++ b/recipes/images/gnuradio-image.bb @@ -4,23 +4,27 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" IMAGE_EXTRA_INSTALL ?= "" +SPLASH ?= "" +ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}' + DEPENDS = "task-base-extended \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ + ${ZZAPSPLASH} \ " IMAGE_INSTALL = "task-base-extended \ ${IMAGE_EXTRA_INSTALL} \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + ${SPLASH} \ + ${ZZAPSPLASH} \ oprofile \ screen \ ntp ntp-bin \ make \ nfs-utils-client \ gnuradio gnuradio-examples \ - " + " export IMAGE_BASENAME = "gnuradio-image" IMAGE_LINGUAS = "" inherit image - diff --git a/recipes/images/minimal-image.bb b/recipes/images/minimal-image.bb index 650a3d681c..e9abcb35ca 100644 --- a/recipes/images/minimal-image.bb +++ b/recipes/images/minimal-image.bb @@ -9,7 +9,7 @@ SPLASH ?= " " IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" IMAGE_INSTALL = "task-boot \ - util-linux-mount util-linux-umount \ + util-linux-ng-mount util-linux-ng-umount \ ${DISTRO_SSH_DAEMON} \ ${ANGSTROM_EXTRA_INSTALL} \ angstrom-version \ |