From f44baac00a9a6d6ea5c9c3e4e87f7262048b08f9 Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Thu, 23 Oct 2008 19:20:20 +0200
Subject: [PATCH] Initial sucrose build

Initial sucrose build
---
 packages/images/sugar-image.bb                | 23 +++++++++++++++++++
 ...ar-base_0.82.0.bb => sugar-base_0.82.2.bb} |  0
 packages/sugar/sugar-fructose.bb              |  3 +++
 ....1.bb => sugar-presence-service_0.82.2.bb} |  0
 packages/sugar/sugar-sucrose.bb               |  4 ++++
 ...kit_0.82.1.bb => sugar-toolkit_0.82.11.bb} |  0
 .../{sugar_0.82.0.bb => sugar_0.82.9.bb}      |  0
 7 files changed, 30 insertions(+)
 create mode 100644 packages/images/sugar-image.bb
 rename packages/sugar/{sugar-base_0.82.0.bb => sugar-base_0.82.2.bb} (100%)
 create mode 100644 packages/sugar/sugar-fructose.bb
 rename packages/sugar/{sugar-presence-service_0.82.1.bb => sugar-presence-service_0.82.2.bb} (100%)
 create mode 100644 packages/sugar/sugar-sucrose.bb
 rename packages/sugar/{sugar-toolkit_0.82.1.bb => sugar-toolkit_0.82.11.bb} (100%)
 rename packages/sugar/{sugar_0.82.0.bb => sugar_0.82.9.bb} (100%)

diff --git a/packages/images/sugar-image.bb b/packages/images/sugar-image.bb
new file mode 100644
index 0000000000..af64e3d062
--- /dev/null
+++ b/packages/images/sugar-image.bb
@@ -0,0 +1,23 @@
+ANGSTROM_EXTRA_INSTALL += " \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+			  " 
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    sugar-sucrose \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.2.bb
similarity index 100%
rename from packages/sugar/sugar-base_0.82.0.bb
rename to packages/sugar/sugar-base_0.82.2.bb
diff --git a/packages/sugar/sugar-fructose.bb b/packages/sugar/sugar-fructose.bb
new file mode 100644
index 0000000000..ad0db39ae9
--- /dev/null
+++ b/packages/sugar/sugar-fructose.bb
@@ -0,0 +1,3 @@
+DESCRIPTION = "Sugar fructose activities"
+
+DEPENDS = "etoys sugar-web-activity"
diff --git a/packages/sugar/sugar-presence-service_0.82.1.bb b/packages/sugar/sugar-presence-service_0.82.2.bb
similarity index 100%
rename from packages/sugar/sugar-presence-service_0.82.1.bb
rename to packages/sugar/sugar-presence-service_0.82.2.bb
diff --git a/packages/sugar/sugar-sucrose.bb b/packages/sugar/sugar-sucrose.bb
new file mode 100644
index 0000000000..3d176453e1
--- /dev/null
+++ b/packages/sugar/sugar-sucrose.bb
@@ -0,0 +1,4 @@
+DESCRIPTION = "Complete sugar environment with core activities"
+
+#DEPENDS = "sugar sugar-fructose"
+DEPENDS = "sugar"
diff --git a/packages/sugar/sugar-toolkit_0.82.1.bb b/packages/sugar/sugar-toolkit_0.82.11.bb
similarity index 100%
rename from packages/sugar/sugar-toolkit_0.82.1.bb
rename to packages/sugar/sugar-toolkit_0.82.11.bb
diff --git a/packages/sugar/sugar_0.82.0.bb b/packages/sugar/sugar_0.82.9.bb
similarity index 100%
rename from packages/sugar/sugar_0.82.0.bb
rename to packages/sugar/sugar_0.82.9.bb
-- 
2.39.5