Initial sucrose build

Initial sucrose build

diff --git a/packages/images/sugar-image.bb b/packages/images/sugar-image.bb
new file mode 100644 (file)
index 0000000..af64e3d
--- /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 (file)
index 0000000..ad0db39
--- /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 (file)
index 0000000..3d17645
--- /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