summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/images/openmoko-asu-image.bb5
-rw-r--r--packages/images/openmoko-base-image.bb (renamed from packages/images/openmoko-bare-image.bb)4
-rw-r--r--packages/tasks/task-openmoko-basic.bb (renamed from packages/tasks/task-openmoko-bare.bb)6
3 files changed, 9 insertions, 6 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-bare-image.bb b/packages/images/openmoko-base-image.bb
index 2e3561dbb2..8acb0f5f90 100644
--- 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
index c85a762015..c06403ffc6 100644
--- 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 \