This email list is read-only. Emails sent to this list will be discarded
----------------------------------
.../packages/tasks/task-moblin-apps-x11-pimlico.bb | 26 +++++++++
meta-moblin/packages/tasks/task-moblin-tools-bb | 58 ++++++++++++++++++++
.../tasks/tasks-moblin-apps-x11-pimlico.bb | 26 ---------
meta/classes/bootimg.bbclass | 4 ++
4 files changed, 88 insertions(+), 26 deletions(-)
New commits:
commit f19e4350c080e1c3c1cd8032cf46930403c3e4e6
Author: Samuel Ortiz <[EMAIL PROTECTED]>
Date: Mon Oct 27 13:43:38 2008 +0100
bootimg: copy rootfs to ISO image
We are only copying the initrd right now.
commit dae95a72e0c23af4f3bb6412a530aaff87d32ee6
Author: Samuel Ortiz <[EMAIL PROTECTED]>
Date: Mon Oct 27 13:34:47 2008 +0100
tasks: apps-x11-pimlico renaming typo
commit 0472967f2463caa89df18f482554e16aadf30f31
Author: Samuel Ortiz <[EMAIL PROTECTED]>
Date: Mon Oct 27 12:34:26 2008 +0100
tasks: fix moblin-tools task name typo
Diff in this email is a maximum of 400 lines.
diff --git a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
new file mode 100644
index 0000000..1ab8163
--- /dev/null
+++ b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2007-2008 OpenedHand Ltd.
+#
+
+DESCRIPTION = "X11 Pimlico Appications List"
+PR = "r27"
+
+PACKAGES = "\
+ task-moblin-apps-x11-pimlico \
+ task-moblin-apps-x11-pimlico-dbg \
+ task-moblin-apps-x11-pimlico-dev \
+ "
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+ALLOW_EMPTY = "1"
+
+WEB = "web-webkit"
+
+RDEPENDS_task-moblin-apps-x11-pimlico = "\
+ eds-dbus \
+ contacts \
+ dates \
+ tasks \
+ gaku \
+ ${WEB}"
diff --git a/meta-moblin/packages/tasks/task-moblin-tools-bb
b/meta-moblin/packages/tasks/task-moblin-tools-bb
new file mode 100644
index 0000000..6d5e60c
--- /dev/null
+++ b/meta-moblin/packages/tasks/task-moblin-tools-bb
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2008 OpenedHand Ltd.
+#
+
+DESCRIPTION = "Tools tasks for Moblin"
+PR = "r1"
+
+PACKAGES = "\
+ task-moblin-tools-debug \
+ task-moblin-tools-debug-dbg \
+ task-moblin-tools-debug-dev \
+ task-moblin-tools-profile \
+ task-moblin-tools-profile-dbg \
+ task-moblin-tools-profile-dev \
+ task-moblin-tools-testapps \
+ task-moblin-tools-testapps-dbg \
+ task-moblin-tools-testapps-dev \
+ "
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-moblin-tools-debug = "\
+ gdb \
+ gdbserver \
+ strace"
+
+RDEPENDS_task-moblin-tools-profile = "\
+ exmap-console \
+ exmap-server \
+ oprofile \
+ oprofileui-server \
+ powertop \
+ lttng-control \
+ lttng-viewer \
+ sreadahead"
+
+RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind"
+
+RRECOMMENDS_task-moblin-tools-profile = "\
+ kernel-module-oprofile"
+
+RDEPENDS_task-moblin-tools-testapps = "\
+ blktool \
+ tslib-calibrate \
+ tslib-tests \
+ lrzsz \
+ kexec-tools \
+ alsa-utils-amixer \
+ alsa-utils-aplay \
+ owl-video \
+ gst-meta-video \
+ gst-meta-audio \
+ xrestop \
+ xwininfo \
+ xprop \
+ xvideo-tests"
diff --git a/meta-moblin/packages/tasks/tasks-moblin-apps-x11-pimlico.bb
b/meta-moblin/packages/tasks/tasks-moblin-apps-x11-pimlico.bb
deleted file mode 100644
index 1ab8163..0000000
--- a/meta-moblin/packages/tasks/tasks-moblin-apps-x11-pimlico.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenedHand Ltd.
-#
-
-DESCRIPTION = "X11 Pimlico Appications List"
-PR = "r27"
-
-PACKAGES = "\
- task-moblin-apps-x11-pimlico \
- task-moblin-apps-x11-pimlico-dbg \
- task-moblin-apps-x11-pimlico-dev \
- "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-
-WEB = "web-webkit"
-
-RDEPENDS_task-moblin-apps-x11-pimlico = "\
- eds-dbus \
- contacts \
- dates \
- tasks \
- gaku \
- ${WEB}"
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index d15818e..1a24ac7 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -83,6 +83,10 @@ build_boot_bin() {
install -m 0644 ${INITRD} ${ISODIR}/initrd
+ if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then
+ install -m 0644 ${ROOTFS} ${ISODIR}/rootfs.img
+ fi
+
# And install the syslinux stuff
cp ${STAGING_DATADIR}/syslinux/isolinux.bin \
${ISODIR}
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
