diff options
Diffstat (limited to 'meta-moblin')
30 files changed, 205 insertions, 187 deletions
diff --git a/meta-moblin/classes/moblin.bbclass b/meta-moblin/classes/moblin.bbclass new file mode 100644 index 0000000000..aac6957583 --- /dev/null +++ b/meta-moblin/classes/moblin.bbclass @@ -0,0 +1,12 @@ + +PREMIRRORS_append () { +ftp://.*/.* http://pokylinux.org/sources/ +http://.*/.* http://pokylinux.org/sources/ +https://.*/.* http://pokylinux.org/sources/ +} + +MIRRORS_append () { +ftp://.*/.* http://pokylinux.org/sources/ +http://.*/.* http://pokylinux.org/sources/ +https://.*/.* http://pokylinux.org/sources/ +} diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf new file mode 100644 index 0000000000..20d96cc2a6 --- /dev/null +++ b/meta-moblin/conf/distro/moblin.conf @@ -0,0 +1,115 @@ +DISTRO = "moblin" +DISTRO_NAME = "Moblin (Poky Powered)" +DISTRO_VERSION = "1.99+snapshot-${DATE}" + +MAINTAINER = "Moblin <dev@lists.moblin.org>" + +PACKAGE_CLASSES ?= "package_rpm" +INHERIT_INSANE ?= "insane" +INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging" + +# For some reason, this doesn't work +# TARGET_OS ?= "linux" +# TARGET_VENDOR ?= "-poky" +# Set by POKYMODE instead +TARGET_OS = "linux" + +QA_LOGFILE = "${TMPDIR}/qa.log" + +IMAGE_ROOTFS_SIZE_ext2 ?= "131072" + +# Metadata is git based +#METADATA_REVISION = "${@base_get_metadata_git_revision(d)}" +#FIXME +METADATA_REVISION = "unknown" + +#IPK_FEED_URIS += " \ +# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ +#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ +# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ +# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ +# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ +# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ +# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" + +#RPM_FEED_URIS += " \ +# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ +#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ +# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ +# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ +# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ +# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ +# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" + +OEINCLUDELOGS = "yes" +KERNEL_CONSOLE = "ttyS0" +#DEBUG_OPTIMIZATION = "-O -g3" +#DEBUG_BUILD = "1" +#INHIBIT_PACKAGE_STRIP = "1" + +# Default to TARGETOS values for EABI +GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" + +POKYMODE ?= "moblin" +require conf/distro/include/poky-${POKYMODE}.inc + +POKYLIBC ?= "glibc" +require conf/distro/include/poky-${POKYLIBC}.inc + +SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}" +SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" + +CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" + +# +# Preferred providers: +# + +# Virtuals: +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" +PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel + +VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" + +# Others: +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" +PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" +PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" +PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" +PREFERRED_PROVIDER_opkg ?= "opkg" + +require conf/distro/include/poky-fixed-revisions.inc +require conf/distro/include/preferred-xorg-versions.inc + +PCMCIA_MANAGER ?= "pcmciautils" + +CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" + +IMAGE_LINGUAS ?= "en-gb" +LIMIT_BUILT_LOCALES ?= "en_GB" +ENABLE_BINARY_LOCALE_GENERATION ?= "1" +LOCALE_UTF8_ONLY = "1" + +DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" + +POKY_EXTRA_RDEPENDS = "" +POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" +POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" +POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" +POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" + +DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" +DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" + +IMAGE_FEATURES ?= "" + +require conf/distro/include/world-broken.inc diff --git a/meta-moblin/packages/images/moblin-image-live.bb b/meta-moblin/packages/images/moblin-image-live.bb index ff12fd4074..3fcfda7279 100644 --- a/meta-moblin/packages/images/moblin-image-live.bb +++ b/meta-moblin/packages/images/moblin-image-live.bb @@ -1,3 +1,7 @@ +# +# Copyright (C) 2008 Intel Corporation. +# + DESCRIPTION = "Netbook Bootable Live Image" require moblin-image-live.inc diff --git a/meta-moblin/packages/images/moblin-image-live.inc b/meta-moblin/packages/images/moblin-image-live.inc index 2dd9a8917f..0f401091c1 100644 --- a/meta-moblin/packages/images/moblin-image-live.inc +++ b/meta-moblin/packages/images/moblin-image-live.inc @@ -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 " diff --git a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb index 1626a40678..7331eff150 100644 --- a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb +++ b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb @@ -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" diff --git a/meta-moblin/packages/images/moblin-image-minimal-live.bb b/meta-moblin/packages/images/moblin-image-minimal-live.bb index 83dab3ecc3..b2c8ff60d2 100644 --- a/meta-moblin/packages/images/moblin-image-minimal-live.bb +++ b/meta-moblin/packages/images/moblin-image-minimal-live.bb @@ -1,3 +1,7 @@ +# +# Copyright (C) 2008 Intel Corporation. +# + DESCRIPTION = "Minimal Bootable Live Image" require moblin-image-live.inc diff --git a/meta-moblin/packages/images/moblin-image-minimal.bb b/meta-moblin/packages/images/moblin-image-minimal.bb new file mode 100644 index 0000000000..3178fff07f --- /dev/null +++ b/meta-moblin/packages/images/moblin-image-minimal.bb @@ -0,0 +1,12 @@ +# +# Copyright (C) 2008 Intel Corporation. +# + +IMAGE_INSTALL = "task-moblin-boot ${ROOTFS_PKGMANAGE}" + +IMAGE_LINGUAS = " " + +inherit moblin-image + +# remove not needed ipkg informations +ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files" diff --git a/meta-moblin/packages/images/moblin-image-netbook-install.bb b/meta-moblin/packages/images/moblin-image-netbook-install.bb new file mode 100644 index 0000000000..184a33cb65 --- /dev/null +++ b/meta-moblin/packages/images/moblin-image-netbook-install.bb @@ -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" diff --git a/meta-moblin/packages/images/moblin-image-netbook-live.bb b/meta-moblin/packages/images/moblin-image-netbook-live.bb new file mode 100644 index 0000000000..3fcfda7279 --- /dev/null +++ b/meta-moblin/packages/images/moblin-image-netbook-live.bb @@ -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" diff --git a/meta-moblin/packages/images/moblin-image-netbook.bb b/meta-moblin/packages/images/moblin-image-netbook.bb index a573dbe83f..8cbcf2a5e2 100644 --- a/meta-moblin/packages/images/moblin-image-netbook.bb +++ b/meta-moblin/packages/images/moblin-image-netbook.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenedHand Ltd. +# Copyright (C) 2008 Intel Corporation. # IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}" diff --git a/meta-moblin/packages/images/moblin-image-sato-live.bb b/meta-moblin/packages/images/moblin-image-sato-live.bb deleted file mode 100644 index 81c07b7e50..0000000000 --- a/meta-moblin/packages/images/moblin-image-sato-live.bb +++ /dev/null @@ -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" diff --git a/meta-moblin/packages/images/moblin-image-sato.bb b/meta-moblin/packages/images/moblin-image-sato.bb deleted file mode 100644 index 61f97334f7..0000000000 --- a/meta-moblin/packages/images/moblin-image-sato.bb +++ /dev/null @@ -1,7 +0,0 @@ -# -# 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 index 84cf107537..44d2cda950 100644 --- a/meta-moblin/packages/images/moblin-image-sdk-live.bb +++ b/meta-moblin/packages/images/moblin-image-sdk-live.bb @@ -1,3 +1,7 @@ +# +# Copyright (C) 2008 Intel Corporation. +# + DESCRIPTION = "Bootable Live SDK Image" require moblin-image-live.inc diff --git a/meta-moblin/packages/images/moblin-image-sdk.bb b/meta-moblin/packages/images/moblin-image-sdk.bb index 0ec00f2574..6f42a33d6c 100644 --- a/meta-moblin/packages/images/moblin-image-sdk.bb +++ b/meta-moblin/packages/images/moblin-image-sdk.bb @@ -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" diff --git a/meta-moblin/packages/images/poky-image-live.bb b/meta-moblin/packages/images/poky-image-live.bb deleted file mode 100644 index a3bfbfc71f..0000000000 --- a/meta-moblin/packages/images/poky-image-live.bb +++ /dev/null @@ -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" diff --git a/meta-moblin/packages/images/poky-image-live.inc b/meta-moblin/packages/images/poky-image-live.inc deleted file mode 100644 index 7f8dd8fba5..0000000000 --- a/meta-moblin/packages/images/poky-image-live.inc +++ /dev/null @@ -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") -} - diff --git a/meta-moblin/packages/images/poky-image-minimal-initramfs.bb b/meta-moblin/packages/images/poky-image-minimal-initramfs.bb deleted file mode 100644 index b2824a7d61..0000000000 --- a/meta-moblin/packages/images/poky-image-minimal-initramfs.bb +++ /dev/null @@ -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 diff --git a/meta-moblin/packages/images/poky-image-minimal-live.bb b/meta-moblin/packages/images/poky-image-minimal-live.bb deleted file mode 100644 index 7d9aa5f154..0000000000 --- a/meta-moblin/packages/images/poky-image-minimal-live.bb +++ /dev/null @@ -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" diff --git a/meta-moblin/packages/images/poky-image-netbook.bb b/meta-moblin/packages/images/poky-image-netbook.bb deleted file mode 100644 index 8138e9d598..0000000000 --- a/meta-moblin/packages/images/poky-image-netbook.bb +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}" - -inherit poky-image diff --git a/meta-moblin/packages/images/poky-image-sato-live.bb b/meta-moblin/packages/images/poky-image-sato-live.bb deleted file mode 100644 index 9b686e812c..0000000000 --- a/meta-moblin/packages/images/poky-image-sato-live.bb +++ /dev/null @@ -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" diff --git a/meta-moblin/packages/images/poky-image-sdk-live.bb b/meta-moblin/packages/images/poky-image-sdk-live.bb deleted file mode 100644 index 807de392a3..0000000000 --- a/meta-moblin/packages/images/poky-image-sdk-live.bb +++ /dev/null @@ -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" diff --git a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb index 1ab8163fc1..4523196bfe 100644 --- a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb +++ b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenedHand Ltd. +# Copyright (C) 2008 Intel Corporation. # DESCRIPTION = "X11 Pimlico Appications List" diff --git a/meta-moblin/packages/tasks/task-moblin-boot.bb b/meta-moblin/packages/tasks/task-moblin-boot.bb index a5b78fcf80..015b94bbaa 100644 --- a/meta-moblin/packages/tasks/task-moblin-boot.bb +++ b/meta-moblin/packages/tasks/task-moblin-boot.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenedHand Ltd. +# Copyright (C) 2008 Intel Corporation. # DESCRIPTION = "Task for Moblin - minimal bootable image" diff --git a/meta-moblin/packages/tasks/task-moblin-sdk.bb b/meta-moblin/packages/tasks/task-moblin-sdk.bb index 84bb71a848..4b6030e2a5 100644 --- a/meta-moblin/packages/tasks/task-moblin-sdk.bb +++ b/meta-moblin/packages/tasks/task-moblin-sdk.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenedHand Ltd. +# Copyright (C) 2008 Intel Corporation. # DESCRIPTON = "Software Development Tasks for Moblin" diff --git a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb index e9384f5ecd..c9f118cdf5 100644 --- a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb +++ b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb @@ -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" diff --git a/meta-moblin/packages/tasks/task-moblin-tools-bb b/meta-moblin/packages/tasks/task-moblin-tools-bb deleted file mode 100644 index 6d5e60cbb8..0000000000 --- a/meta-moblin/packages/tasks/task-moblin-tools-bb +++ /dev/null @@ -1,58 +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 \ - 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-tools.bb b/meta-moblin/packages/tasks/task-moblin-tools.bb index 33dad20d89..86ac7ff364 100644 --- a/meta-moblin/packages/tasks/tasks-moblin-tools.bb +++ b/meta-moblin/packages/tasks/task-moblin-tools.bb @@ -1,9 +1,9 @@ # -# Copyright (C) 2008 OpenedHand Ltd. +# Copyright (C) 2008 Intel Corporation. # -DESCRIPTION = "Tools tasks for Moblin" -PR = "r1" +DESCRIPTION = "Debuggin and profiling tools tasks for Moblin" +PR = "r2" PACKAGES = "\ task-moblin-tools-debug \ @@ -27,13 +27,14 @@ RDEPENDS_task-moblin-tools-debug = "\ strace" RDEPENDS_task-moblin-tools-profile = "\ - exmap-console \ - exmap-server \ +# exmap-console \ +# exmap-server \ oprofile \ oprofileui-server \ powertop \ lttng-control \ lttng-viewer" +# sreadahead" RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind" diff --git a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb index 90ee0d1ac6..b8fa1e3442 100644 --- a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb +++ b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb @@ -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 = "\ diff --git a/meta-moblin/packages/tasks/task-moblin-x11-sato.bb b/meta-moblin/packages/tasks/task-moblin-x11-sato.bb deleted file mode 100644 index 6ae3bc07c7..0000000000 --- a/meta-moblin/packages/tasks/task-moblin-x11-sato.bb +++ /dev/null @@ -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}" diff --git a/meta-moblin/packages/tasks/task-moblin.bb b/meta-moblin/packages/tasks/task-moblin.bb index cb9f0c34c7..9b34d99993 100644 --- a/meta-moblin/packages/tasks/task-moblin.bb +++ b/meta-moblin/packages/tasks/task-moblin.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenedHand Ltd. +# Copyright (C) 2008 Intel Corporation. # DESCRIPTION = "Tasks for Moblin" |