This email list is read-only. Emails sent to this list will be discarded
----------------------------------
meta-moblin/classes/moblin-image.bbclass | 98 ++++++++++++++++++++
meta-moblin/packages/images/moblin-image-live.bb | 9 ++
meta-moblin/packages/images/moblin-image-live.inc | 18 ++++
.../images/moblin-image-minimal-initramfs.bb | 8 ++
.../packages/images/moblin-image-minimal-live.bb | 9 ++
.../packages/images/moblin-image-netbook.bb | 7 ++
.../packages/images/moblin-image-sato-live.bb | 9 ++
meta-moblin/packages/images/moblin-image-sato.bb | 7 ++
.../packages/images/moblin-image-sdk-live.bb | 9 ++
meta-moblin/packages/images/moblin-image-sdk.bb | 7 ++
meta-moblin/packages/tasks/task-moblin-boot.bb | 32 +++++++
meta-moblin/packages/tasks/task-moblin-sdk.bb | 83 +++++++++++++++++
.../tasks/task-moblin-standalone-sdk-target.bb | 40 ++++++++
.../packages/tasks/task-moblin-x11-netbook.bb | 28 ++++++
meta-moblin/packages/tasks/task-moblin-x11-sato.bb | 29 ++++++
meta-moblin/packages/tasks/task-moblin.bb | 66 +++++++++++++
.../tasks/tasks-moblin-apps-x11-pimlico.bb | 26 +++++
meta-moblin/packages/tasks/tasks-moblin-tools.bb | 57 +++++++++++
meta/packages/images/poky-image-live.bb | 9 ++
19 files changed, 551 insertions(+), 0 deletions(-)
New commits:
commit acdff2b1542a3e6a333fa2c58a8a64dcb7b86808
Author: Samuel Ortiz <[EMAIL PROTECTED]>
Date: Fri Oct 24 18:10:49 2008 +0200
images: put poky-image-live back to meta/
commit d5417e5a42d37f1df81699fae6d9ec965f21f887
Author: Samuel Ortiz <[EMAIL PROTECTED]>
Date: Fri Oct 24 17:57:33 2008 +0200
meta-moblin: rename images and tasks from poky-* to moblin-*
Diff in this email is a maximum of 400 lines.
diff --git a/meta-moblin/classes/moblin-image.bbclass
b/meta-moblin/classes/moblin-image.bbclass
new file mode 100644
index 0000000..aff89bc
--- /dev/null
+++ b/meta-moblin/classes/moblin-image.bbclass
@@ -0,0 +1,98 @@
+# Common for Moblin images
+#
+# Copyright (C) 2007 OpenedHand LTD
+
+# IMAGE_FEATURES control content of images built with Poky.
+#
+# By default we install task-moblin-boot and task-base packages - this gives us
+# working (console only) rootfs.
+#
+# Available IMAGE_FEATURES:
+#
+# - apps-console-core
+# - x11-base - X11 server + minimal desktop
+# - x11-sato - OpenedHand Sato environment
+# - x11-netbook - Metacity based environment for netbooks
+# - apps-x11-core - X Terminal, file manager, file editor
+# - apps-x11-games
+# - apps-x11-pimlico - OpenedHand Pimlico apps
+# - tools-sdk - SDK
+# - tools-debug - debugging tools
+# - tools-profile - profiling tools
+# - tools-testapps - tools usable to make some device tests
+# - nfs-server - NFS server (exports / over NFS to everybody)
+# - dev-pkgs - development packages
+# - dbg-pkgs - debug packages
+#
+
+MOBLIN_BASE_INSTALL = '\
+ task-moblin-boot \
+ task-base-extended \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "dbg-pkgs", "task-moblin-boot-dbg
task-base-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "dev-pkgs", "task-moblin-boot-dev
task-base-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "apps-console-core",
"task-moblin-apps-console", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"],
"task-moblin-apps-console-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"],
"task-moblin-apps-console-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "x11-base", "task-moblin-x11-base",
"",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"],
"task-moblin-x11-base-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["x11-base", "dev-pkgs"],
"task-moblin-x11-base-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "x11-sato", "task-moblin-x11-sato",
"",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"],
"task-moblin-x11-sato-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"],
"task-moblin-x11-sato-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "x11-netbook",
"task-moblin-x11-netbook", "", d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"],
"task-moblin-x11-netbook-dbg", "", d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"],
"task-moblin-x11-netbook-dev", "", d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "apps-x11-core",
"task-moblin-apps-x11-core", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"],
"task-moblin-apps-x11-core-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"],
"task-moblin-apps-x11-core-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "apps-x11-games",
"task-moblin-apps-x11-games", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"],
"task-moblin-apps-x11-games-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"],
"task-moblin-apps-x11-games-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "apps-x11-pimlico",
"task-moblin-apps-x11-pimlico", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"],
"task-moblin-apps-x11-pimlico-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"],
"task-moblin-apps-x11-pimlico-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "tools-debug",
"task-moblin-tools-debug", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"],
"task-moblin-tools-debug-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"],
"task-moblin-tools-debug-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "tools-profile",
"task-moblin-tools-profile", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"],
"task-moblin-tools-profile-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"],
"task-moblin-tools-profile-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "tools-testapps",
"task-moblin-tools-testapps", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"],
"task-moblin-tools-testapps-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"],
"task-moblin-tools-testapps-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "tools-sdk", "task-moblin-sdk
task-moblin-standalone-sdk-target", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"],
"task-moblin-sdk-dbg", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"],
"task-moblin-sdk-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "nfs-server",
"task-moblin-nfs-server", "",d)} \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"],
"task-moblin-nfs-server-dbg", "",d)} \
+
+ [EMAIL PROTECTED]("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"],
"task-moblin-nfs-server-dev", "",d)} \
+ \
+ [EMAIL PROTECTED]("IMAGE_FEATURES", "package-management",
"${ROOTFS_PKGMANAGE}", "",d)} \
+ ${MOBLIN_EXTRA_INSTALL} \
+ '
+
+MOBLIN_EXTRA_INSTALL ?= ""
+
+IMAGE_INSTALL ?= "${MOBLIN_BASE_INSTALL}"
+
+X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
+ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games
apps-x11-pimlico package-management"
+SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} apps-x11-sato"
+NETBOOK_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} apps-x11-netbook"
+
+inherit image
+
+# Create /etc/timestamp during image construction to give a reasonably sane
default time setting
+ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp"
diff --git a/meta-moblin/packages/images/moblin-image-live.bb
b/meta-moblin/packages/images/moblin-image-live.bb
new file mode 100644
index 0000000..ff12fd4
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Netbook Bootable Live Image"
+
+require moblin-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
+
+do_bootimg[depends] += "moblin-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-live.inc
b/meta-moblin/packages/images/moblin-image-live.inc
new file mode 100644
index 0000000..2dd9a89
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-live.inc
@@ -0,0 +1,18 @@
+AUTO_SYSLINUXCFG = "1"
+INITRD =
"${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz"
+APPEND += "root=/dev/ram0 "
+TIMEOUT = "10"
+
+EXCLUDE_FROM_WORLD = "1"
+
+do_bootimg[depends] += "moblin-image-minimal-initramfs:do_rootfs"
+
+inherit bootimg
+
+do_bootimg_prepend () {
+ import bb
+ fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
+ if 'ext3' not in fstypes:
+ bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
+}
+
diff --git a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
new file mode 100644
index 0000000..1626a40
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
@@ -0,0 +1,8 @@
+# Simple initramfs image. Mostly used for live images.
+
+IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
+
+export IMAGE_BASENAME = "moblin-image-minimal-initramfs"
+IMAGE_LINGUAS = ""
+
+inherit moblin-image
diff --git a/meta-moblin/packages/images/moblin-image-minimal-live.bb
b/meta-moblin/packages/images/moblin-image-minimal-live.bb
new file mode 100644
index 0000000..83dab3e
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-minimal-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Minimal Bootable Live Image"
+
+require moblin-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-${MACHINE}.ext3"
+
+do_bootimg[depends] += "moblin-image-minimal:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-netbook.bb
b/meta-moblin/packages/images/moblin-image-netbook.bb
new file mode 100644
index 0000000..a573dbe
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-netbook.bb
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
+
+inherit moblin-image
diff --git a/meta-moblin/packages/images/moblin-image-sato-live.bb
b/meta-moblin/packages/images/moblin-image-sato-live.bb
new file mode 100644
index 0000000..81c07b7
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-sato-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Sato Bootable Live Image"
+
+require moblin-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-sato-${MACHINE}.ext3"
+
+do_bootimg[depends] += "moblin-image-sato:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-sato.bb
b/meta-moblin/packages/images/moblin-image-sato.bb
new file mode 100644
index 0000000..61f9733
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-sato.bb
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
+
+inherit moblin-image
diff --git a/meta-moblin/packages/images/moblin-image-sdk-live.bb
b/meta-moblin/packages/images/moblin-image-sdk-live.bb
new file mode 100644
index 0000000..84cf107
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-sdk-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Bootable Live SDK Image"
+
+require moblin-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-sdk-${MACHINE}.ext3"
+
+do_bootimg[depends] += "moblin-image-sdk:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-sdk.bb
b/meta-moblin/packages/images/moblin-image-sdk.bb
new file mode 100644
index 0000000..0ec00f2
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-sdk.bb
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug
tools-profile tools-sdk dev-pkgs dbg-pkgs"
+
+inherit moblin-image
diff --git a/meta-moblin/packages/tasks/task-moblin-boot.bb
b/meta-moblin/packages/tasks/task-moblin-boot.bb
new file mode 100644
index 0000000..a5b78fc
--- /dev/null
+++ b/meta-moblin/packages/tasks/task-moblin-boot.bb
@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+DESCRIPTION = "Task for Moblin - minimal bootable image"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+DEPENDS = "virtual/kernel"
+ALLOW_EMPTY = "1"
+PR = "r7"
+
+#
+# Set by the machine configuration with packages essential for device bootup
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+RDEPENDS_task-moblin-boot = "\
+ base-files \
+ base-passwd \
+ busybox \
+ initscripts \
+ [EMAIL PROTECTED]("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
+ modutils-initscripts \
+ netbase \
+ sysvinit \
+ tinylogin \
+ udev \
+ ${VIRTUAL-RUNTIME_update-alternatives} \
+ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-moblin-boot = "\
+ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
diff --git a/meta-moblin/packages/tasks/task-moblin-sdk.bb
b/meta-moblin/packages/tasks/task-moblin-sdk.bb
new file mode 100644
index 0000000..84bb71a
--- /dev/null
+++ b/meta-moblin/packages/tasks/task-moblin-sdk.bb
@@ -0,0 +1,83 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+DESCRIPTON = "Software Development Tasks for Moblin"
+DEPENDS = "task-moblin"
+PR = "r5"
+
+ALLOW_EMPTY = "1"
+#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
+
+PACKAGES = "\
+ task-moblin-sdk \
+ task-moblin-sdk-dbg \
+ task-moblin-sdk-dev"
+
+RDEPENDS_task-moblin-sdk = "\
+ autoconf \
+ automake \
+ binutils \
+ binutils-symlinks \
+ coreutils \
+ cpp \
+ cpp-symlinks \
+ diffutils \
+ gcc \
+ gcc-symlinks \
+ g++ \
+ g++-symlinks \
+ gettext \
+ make \
+ intltool \
+ libstdc++ \
+ libstdc++-dev \
+ libtool \
+ perl-module-re \
+ perl-module-text-wrap \
+ pkgconfig \
+ findutils \
+ quilt \
+ less \
+ distcc"
+
+#python generate_sdk_pkgs () {
+# moblin_pkgs = read_pkgdata('task-moblin', d)['PACKAGES']
+# pkgs = bb.data.getVar('PACKAGES', d, 1).split()
+# for pkg in moblin_pkgs.split():
+# newpkg = pkg.replace('task-moblin', 'task-moblin-sdk')
+#
+# # for each of the task packages, add a corresponding sdk task
+# pkgs.append(newpkg)
+#
+# # for each sdk task, take the rdepends of the non-sdk task, and turn
+# # that into rrecommends upon the -dev versions of those, not unlike
+# # the package depchain code
+# spkgdata = read_subpkgdata(pkg, d)
+#
+# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '')
+# rreclist = []
+#
+# for depend in rdepends:
+# split_depend = depend.split(' (')
+# name = split_depend[0].strip()
+# if packaged('%s-dev' % name, d):
+# rreclist.append('%s-dev' % name)
+# else:
+# deppkgdata = read_subpkgdata(name, d)
+# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name)
or '')
+# for depend in rdepends2:
+# split_depend = depend.split(' (')
+# name = split_depend[0].strip()
+# if packaged('%s-dev' % name, d):
+# rreclist.append('%s-dev' % name)
+#
+# oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or ''
+# bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + '
'.join(rreclist), d)
+# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg,
bb.data.getVar('RRECOMMENDS_%s' % newpkg, d)))
+#
+# # bb.note('pkgs is %s' % pkgs)
+# bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
+#}
+#
+#PACKAGES_DYNAMIC = "task-moblin-sdk-*"
diff --git a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
new file mode 100644
index 0000000..e9384f5
--- /dev/null
+++ b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Target packages for the standalone SDK"
+PR = "r4"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN} ${PN}-dbg"
+
+RDEPENDS_${PN} = "\
+ libgcc \
+ libstdc++ \
+ "
+
+GLIBC_DEPENDENCIES = "\
+ libsegfault \
+ glibc \
+ glibc-dbg \
+ glibc-dev \
+ glibc-utils \
+ glibc-thread-db \
+ glibc-localedata-i18n \
+ glibc-gconv-ibm850 \
+ glibc-gconv-cp1252 \
+ glibc-gconv-iso8859-1 \
+ glibc-gconv-iso8859-15 \
+ locale-base-en-gb \
+ "
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
