summaryrefslogtreecommitdiff
path: root/packages/images
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2008-03-20 06:23:52 +0000
committerGraeme Gregory <dp@xora.org.uk>2008-03-20 06:23:52 +0000
commit59bf0fe4238ee5c18cf7dd7a8598b64445b8457f (patch)
tree25076e6160e6efc1a3a3a35cbad1a0870154fc78 /packages/images
parent308aa739417f1e3b11000e2268da69f3e3db3828 (diff)
parent1008c8c2925767928b47d87b1e4b64004ea3d51b (diff)
merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'
and 'f2611b9289af3945942b74edcc7ef91fb0a597bd'
Diffstat (limited to 'packages/images')
-rw-r--r--packages/images/openmoko-image.bb16
-rw-r--r--packages/images/openmoko-minimal-image.bb21
-rw-r--r--packages/images/openmoko-qtopia-image.bb22
-rw-r--r--packages/images/openmoko-qtopia-x11-image.bb7
4 files changed, 54 insertions, 12 deletions
diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 1e8b36318c..9dd849608d 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -2,11 +2,9 @@
# OpenMoko Image Recipe
#------------------------------------------------------
-IMAGE_LINGUAS = ""
+require openmoko-minimal-image.bb
-IMAGE_INSTALL = "\
- ${MACHINE_TASK_PROVIDER} \
- task-openmoko-linux \
+IMAGE_INSTALL += "\
task-openmoko-net \
task-openmoko-ui \
task-openmoko-base \
@@ -15,12 +13,6 @@ IMAGE_INSTALL = "\
task-openmoko-pim \
"
-DEPENDS = "\
- ${MACHINE_TASK_PROVIDER} \
+DEPENDS += "\
task-openmoko \
-"
-
-
-inherit image
-
-ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
+ "
diff --git a/packages/images/openmoko-minimal-image.bb b/packages/images/openmoko-minimal-image.bb
new file mode 100644
index 0000000000..15506c42e3
--- /dev/null
+++ b/packages/images/openmoko-minimal-image.bb
@@ -0,0 +1,21 @@
+#------------------------------------------------------
+# OpenMoko Minimal Image Recipe
+# other openmoko images should include this.
+# -----------------------------------------------------
+
+IMAGE_LINGUAS = ""
+
+IMAGE_INSTALL = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-openmoko-linux \
+ "
+
+DEPENDS = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-openmoko-linux \
+ "
+
+
+inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
diff --git a/packages/images/openmoko-qtopia-image.bb b/packages/images/openmoko-qtopia-image.bb
new file mode 100644
index 0000000000..351e17e1d8
--- /dev/null
+++ b/packages/images/openmoko-qtopia-image.bb
@@ -0,0 +1,22 @@
+#------------------------------------------------------
+# OpenMoko Qtopia Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+export IMAGE_BASENAME = "${PN}"
+
+IMAGE_INSTALL += "\
+ alsa-state \
+ bluez-hcidump \
+ bluez-utils \
+ task-openmoko-qtopia \
+"
+
+DEPENDS += "\
+ task-openmoko-qtopia \
+"
+
+RDEPENDS = "${PACKAGE_INSTALL}"
+
+LICENSE = MIT
diff --git a/packages/images/openmoko-qtopia-x11-image.bb b/packages/images/openmoko-qtopia-x11-image.bb
new file mode 100644
index 0000000000..3291c53369
--- /dev/null
+++ b/packages/images/openmoko-qtopia-x11-image.bb
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# OpenMoko Qtopia/X11 Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-qtopia-x11"