summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernie Innocenti <bernie@codewiz.org>2008-10-23 19:20:20 +0200
committerKoen Kooi <koen@openembedded.org>2008-11-17 17:53:40 +0100
commitf44baac00a9a6d6ea5c9c3e4e87f7262048b08f9 (patch)
tree8b3644657a8955fd75faca1b679e7da2478a26c1
parent978b324434f8712670fecb6e7f8e8c738ee8e53c (diff)
Initial sucrose build
Initial sucrose build
-rw-r--r--packages/images/sugar-image.bb23
-rw-r--r--packages/sugar/sugar-base_0.82.2.bb (renamed from packages/sugar/sugar-base_0.82.0.bb)0
-rw-r--r--packages/sugar/sugar-fructose.bb3
-rw-r--r--packages/sugar/sugar-presence-service_0.82.2.bb (renamed from packages/sugar/sugar-presence-service_0.82.1.bb)0
-rw-r--r--packages/sugar/sugar-sucrose.bb4
-rw-r--r--packages/sugar/sugar-toolkit_0.82.11.bb (renamed from packages/sugar/sugar-toolkit_0.82.1.bb)0
-rw-r--r--packages/sugar/sugar_0.82.9.bb (renamed from packages/sugar/sugar_0.82.0.bb)0
7 files changed, 30 insertions, 0 deletions
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
index 15c4e11f9d..15c4e11f9d 100644
--- a/packages/sugar/sugar-base_0.82.0.bb
+++ b/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
index 67b96f7b20..67b96f7b20 100644
--- a/packages/sugar/sugar-presence-service_0.82.1.bb
+++ b/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
index da897ffe47..da897ffe47 100644
--- a/packages/sugar/sugar-toolkit_0.82.1.bb
+++ b/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
index 480ec5001f..480ec5001f 100644
--- a/packages/sugar/sugar_0.82.0.bb
+++ b/packages/sugar/sugar_0.82.9.bb