diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 01:09:51 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 01:09:51 +0100 |
| commit | ce81a5820f712888529f7814ae11cce4ce3f6bd9 (patch) | |
| tree | c6aa834d51accf4f4182bc0c7bfd93247c12607f /packages/images | |
| parent | 61d929464d8d345d5e0a4d6b1a9955c77f708e3c (diff) | |
| parent | e13eb6ed3ee15de931a517361ad80f9248798873 (diff) | |
| download | openembedded-ce81a5820f712888529f7814ae11cce4ce3f6bd9.tar.gz | |
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Conflicts:
packages/tasks/task-openmoko-feed.bb
Diffstat (limited to 'packages/images')
| -rw-r--r-- | packages/images/openmoko-asu-image.bb | 5 | ||||
| -rw-r--r-- | packages/images/openmoko-base-image.bb | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/packages/images/openmoko-asu-image.bb b/packages/images/openmoko-asu-image.bb index 2a8896c592..e7307c73d0 100644 --- a/packages/images/openmoko-asu-image.bb +++ b/packages/images/openmoko-asu-image.bb @@ -4,4 +4,7 @@ require openmoko-minimal-image.bb -IMAGE_INSTALL += "task-openmoko-asu" +IMAGE_INSTALL += "\ + task-openmoko-asu \ + task-openmoko-basic \ + " diff --git a/packages/images/openmoko-base-image.bb b/packages/images/openmoko-base-image.bb new file mode 100644 index 0000000000..8acb0f5f90 --- /dev/null +++ b/packages/images/openmoko-base-image.bb @@ -0,0 +1,7 @@ +#------------------------------------------------------ +# Openmoko Base Image Recipe +#------------------------------------------------------ + +require openmoko-minimal-image.bb + +IMAGE_INSTALL += "task-openmoko-basic" |