Tidy up images and tasks in meta and meta-moblin.

meta now only contains images and tasks relating to core Poky and the Sato environment.
meta-moblin contains images and tasks for netbooks and the moblin environment.

Remove any duplicated tasks and images and rename images and tasks in meta-moblin.
This commit is contained in:
Joshua Lock 2008-10-29 10:37:53 +00:00
parent d0e6c71695
commit 98e6b819e4
31 changed files with 64 additions and 209 deletions

View File

@ -1,3 +1,7 @@
#
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Netbook Bootable Live Image"
require moblin-image-live.inc

View File

@ -1,3 +1,7 @@
#
# Copyright (C) 2008 Intel Corporation.
#
AUTO_SYSLINUXCFG = "1"
INITRD = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz"
APPEND += "root=/dev/ram0 "

View File

@ -1,4 +1,8 @@
# Simple initramfs image. Mostly used for live images.
#
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Simple initramfs image. Mostly used for live images."
IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"

View File

@ -1,3 +1,7 @@
#
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Minimal Bootable Live Image"
require moblin-image-live.inc

View File

@ -1,6 +1,7 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
# Copyright (C) 2008 Intel Corporation.
#
IMAGE_INSTALL = "task-moblin-boot ${ROOTFS_PKGMANAGE}"
IMAGE_LINGUAS = " "

View File

@ -0,0 +1,13 @@
#
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Netbook Bootable Live Image"
require moblin-image-live.inc
LABELS += "install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
do_bootimg[depends] += "moblin-image-netbook:do_rootfs"

View File

@ -0,0 +1,13 @@
#
# Copyright (C) 2008 Intel Corporation.
#
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"

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
# Copyright (C) 2008 Intel Corporation.
#
IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"

View File

@ -1,9 +0,0 @@
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"

View File

@ -1,7 +0,0 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
#
IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
inherit moblin-image

View File

@ -1,3 +1,7 @@
#
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Bootable Live SDK Image"
require moblin-image-live.inc

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
# Copyright (C) 2008 Intel Corporation.
#
IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs dbg-pkgs"

View File

@ -1,9 +0,0 @@
DESCRIPTION = "Netbook Bootable Live Image"
require poky-image-live.inc
LABELS += "boot install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-netbook:do_rootfs"

View File

@ -1,18 +0,0 @@
AUTO_SYSLINUXCFG = "1"
INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
APPEND += "root=/dev/ram0 "
TIMEOUT = "10"
EXCLUDE_FROM_WORLD = "1"
do_bootimg[depends] += "poky-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")
}

View File

@ -1,8 +0,0 @@
# Simple initramfs image. Mostly used for live images.
IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
export IMAGE_BASENAME = "poky-image-minimal-initramfs"
IMAGE_LINGUAS = ""
inherit poky-image

View File

@ -1,9 +0,0 @@
DESCRIPTION = "Minimal Bootable Live Image"
require poky-image-live.inc
LABELS += "boot install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-minimal:do_rootfs"

View File

@ -1,7 +0,0 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
#
IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
inherit poky-image

View File

@ -1,9 +0,0 @@
DESCRIPTION = "Sato Bootable Live Image"
require poky-image-live.inc
LABELS += "boot install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-sato:do_rootfs"

View File

@ -1,9 +0,0 @@
DESCRIPTION = "Bootable Live SDK Image"
require poky-image-live.inc
LABELS += "boot install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sdk-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-sdk:do_rootfs"

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2007-2008 OpenedHand Ltd.
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "X11 Pimlico Appications List"

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Task for Moblin - minimal bootable image"

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTON = "Software Development Tasks for Moblin"

View File

@ -1,4 +1,8 @@
DESCRIPTION = "Target packages for the standalone SDK"
#
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Target packages for the standalone Moblin SDK"
PR = "r4"
LICENSE = "MIT"
ALLOW_EMPTY = "1"

View File

@ -1,8 +1,8 @@
#
# Copyright (C) 2008 OpenedHand Ltd.
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Tools tasks for Moblin"
DESCRIPTION = "Debuggin and profiling tools tasks for Moblin"
PR = "r1"
PACKAGES = "\

View File

@ -1,8 +1,8 @@
#
# Copyright (C) 2008 Intel.
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Netbook Tasks for Moblin"
DESCRIPTION = "Netbook GUI Tasks for Moblin"
PR = "r0"
PACKAGES = "\

View File

@ -1,29 +0,0 @@
#
# Copyright (C) 2007-2008 OpenedHand Ltd.
#
DESCRIPTION = "Sato Tasks for Moblin"
PR = "r29"
PACKAGES = "\
task-moblin-x11-sato \
task-moblin-x11-sato-dbg \
task-moblin-x11-sato-dev \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
NETWORK_MANAGER ?= "networkmanager-applet"
RDEPENDS_task-moblin-x11-sato = "\
matchbox-desktop \
matchbox-session-sato \
matchbox-keyboard \
matchbox-stroke \
matchbox-config-gtk \
xcursor-transparent-theme \
sato-icon-theme \
settings-daemon \
gtk-sato-engine \
${NETWORK_MANAGER}"

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2007-2008 OpenedHand Ltd.
# Copyright (C) 2008 Intel Corporation.
#
DESCRIPTION = "Tasks for Moblin"

View File

@ -1,57 +0,0 @@
#
# 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"
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"

View File

@ -1,9 +0,0 @@
DESCRIPTION = "Netbook Bootable Live Image"
require poky-image-live.inc
LABELS += "install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-netbook:do_rootfs"

View File

@ -1,9 +0,0 @@
DESCRIPTION = "Netbook Bootable Live Image"
require poky-image-live.inc
LABELS += "boot install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-netbook:do_rootfs"

View File

@ -1,7 +0,0 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
#
IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
inherit poky-image