From 5b098ecf04f295e70ba46dfe6f9552f1671e9bc4 Mon Sep 17 00:00:00 2001
From: Julian_chu <julian_chu@openmoko.com>
Date: Tue, 2 Sep 2008 11:19:08 +0800
Subject: 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.
---
 packages/images/openmoko-asu-image.bb  |  5 ++++-
 packages/images/openmoko-bare-image.bb |  7 ------
 packages/images/openmoko-base-image.bb |  7 ++++++
 packages/tasks/task-openmoko-bare.bb   | 41 ----------------------------------
 packages/tasks/task-openmoko-basic.bb  | 41 ++++++++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 49 deletions(-)
 delete mode 100644 packages/images/openmoko-bare-image.bb
 create mode 100644 packages/images/openmoko-base-image.bb
 delete mode 100644 packages/tasks/task-openmoko-bare.bb
 create mode 100644 packages/tasks/task-openmoko-basic.bb

(limited to 'packages')

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-bare-image.bb
deleted file mode 100644
index 2e3561dbb2..0000000000
--- a/packages/images/openmoko-bare-image.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#------------------------------------------------------
-# Openmoko Bare Image Recipe
-#------------------------------------------------------
-
-require openmoko-minimal-image.bb
-
-IMAGE_INSTALL += "task-openmoko-bare"
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"
diff --git a/packages/tasks/task-openmoko-bare.bb b/packages/tasks/task-openmoko-bare.bb
deleted file mode 100644
index c85a762015..0000000000
--- a/packages/tasks/task-openmoko-bare.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-LICENSE = "MIT"
-PR = "r0.01"
-
-inherit task
-
-PACKAGES = "task-openmoko-bare"
-
-DESCRIPTION_task-openmoko-qtopia-x11 = "Openmoko: Provide Window Manager, Om-settings and Om-installer"
-RDEPENDS_task-openmoko-bare = "\
-           readline \
-           connman \
-           connman-plugin-connman-resolvconf \
-           connman-plugin-connman-dhclient \
-           connman-plugin-connman-80211 \
-           connman-script-dhclient \
-           libnotify \
-# X
-
-# illume-theme-asu should be first than illume
-# to let opkg install illume-theme-asu first than illume-theme-freesmartphone
-# then we have ASU theme but not FSO theme in default.
-           illume-theme-asu \
-           illume \
-           e-wm \
-           ${XSERVER} \
-           xserver-kdrive-common \
-           xserver-nodm-init \
-           xauth \
-           xhost \
-           xset \
-           xrandr \
-# Om applications
-           assassin \
-           assassin-thumbnail \
-           om-settings \
-           openmoko-community-repository \
-"
diff --git a/packages/tasks/task-openmoko-basic.bb b/packages/tasks/task-openmoko-basic.bb
new file mode 100644
index 0000000000..c06403ffc6
--- /dev/null
+++ b/packages/tasks/task-openmoko-basic.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "MIT"
+PR = "r0.02"
+
+inherit task
+
+PACKAGES = "task-openmoko-basic"
+
+DESCRIPTION_task-openmoko-qtopia-x11 = "Openmoko: Provide Window Manager, Om-settings and Om-installer"
+RDEPENDS_task-openmoko-basic = "\
+           readline \
+           connman \
+           connman-plugin-connman-resolvconf \
+           connman-plugin-connman-dhclient \
+           connman-plugin-connman-80211 \
+           connman-script-dhclient \
+           libnotify \
+# X
+
+# illume-theme-asu should be first than illume
+# to let opkg install illume-theme-asu first than illume-theme-freesmartphone
+# then we have ASU theme but not FSO theme in default.
+           illume-theme-asu \
+           illume \
+           e-wm \
+           ${XSERVER} \
+           xserver-kdrive-common \
+           xserver-nodm-init \
+           xauth \
+           xhost \
+           xset \
+           xrandr \
+# Om applications
+           assassin \
+           assassin-thumbnail \
+           om-settings \
+           openmoko-community-repository \
+"
-- 
cgit v1.2.3