openmoko: Change name of image from openmoko-bare to openmoko-base

They don't like the name, openmoko-bare-image. Change it to openmoko-base-image.
Also change the task from task-openmoko-bare to task-openmoko-basic.

diff --git a/packages/images/openmoko-asu-image.bb b/packages/images/openmoko-asu-image.bb
index 2a8896c5925d3d4537c820ddb2b6a3eea821c1f4..e7307c73d0dd66e7a3547f2a469a861653a901e5 100644 (file)
--- 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-bare-image.bb b/packages/images/openmoko-base-image.bb
similarity index 68%
rename from packages/images/openmoko-bare-image.bb
rename to packages/images/openmoko-base-image.bb
index 2e3561dbb224ab381f5a31fb0343113ff4f290ad..8acb0f5f90685e99d0e488e9480c8612a614a9c6 100644 (file)
--- a/packages/images/openmoko-bare-image.bb
+++ b/packages/images/openmoko-base-image.bb
@@ -1,7 +1,7 @@
 #------------------------------------------------------
-# Openmoko Bare Image Recipe
+# Openmoko Base Image Recipe
 #------------------------------------------------------
 
 require openmoko-minimal-image.bb
 
-IMAGE_INSTALL += "task-openmoko-bare"
+IMAGE_INSTALL += "task-openmoko-basic"

diff --git a/packages/tasks/task-openmoko-bare.bb b/packages/tasks/task-openmoko-basic.bb
similarity index 93%
rename from packages/tasks/task-openmoko-bare.bb
rename to packages/tasks/task-openmoko-basic.bb
index c85a76201529e23f7c9d2b157d48e62f3e56e831..c06403ffc62fe64c550bf6f0f88dd2ca07781aef 100644 (file)
--- a/packages/tasks/task-openmoko-bare.bb
+++ b/packages/tasks/task-openmoko-basic.bb
@@ -3,14 +3,14 @@ SECTION = "openmoko/base"
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 LICENSE = "MIT"
-PR = "r0.01"
+PR = "r0.02"
 
 inherit task
 
-PACKAGES = "task-openmoko-bare"
+PACKAGES = "task-openmoko-basic"
 
 DESCRIPTION_task-openmoko-qtopia-x11 = "Openmoko: Provide Window Manager, Om-settings and Om-installer"
-RDEPENDS_task-openmoko-bare = "\
+RDEPENDS_task-openmoko-basic = "\
            readline \
            connman \
            connman-plugin-connman-resolvconf \