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 @@ | |||
1 | |||
2 | PREMIRRORS_append () { | ||
3 | ftp://.*/.* http://pokylinux.org/sources/ | ||
4 | http://.*/.* http://pokylinux.org/sources/ | ||
5 | https://.*/.* http://pokylinux.org/sources/ | ||
6 | } | ||
7 | |||
8 | MIRRORS_append () { | ||
9 | ftp://.*/.* http://pokylinux.org/sources/ | ||
10 | http://.*/.* http://pokylinux.org/sources/ | ||
11 | https://.*/.* http://pokylinux.org/sources/ | ||
12 | } | ||
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 @@ | |||
1 | DISTRO = "moblin" | ||
2 | DISTRO_NAME = "Moblin (Poky Powered)" | ||
3 | DISTRO_VERSION = "1.99+snapshot-${DATE}" | ||
4 | |||
5 | MAINTAINER = "Moblin <dev@lists.moblin.org>" | ||
6 | |||
7 | PACKAGE_CLASSES ?= "package_rpm" | ||
8 | INHERIT_INSANE ?= "insane" | ||
9 | INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging" | ||
10 | |||
11 | # For some reason, this doesn't work | ||
12 | # TARGET_OS ?= "linux" | ||
13 | # TARGET_VENDOR ?= "-poky" | ||
14 | # Set by POKYMODE instead | ||
15 | TARGET_OS = "linux" | ||
16 | |||
17 | QA_LOGFILE = "${TMPDIR}/qa.log" | ||
18 | |||
19 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" | ||
20 | |||
21 | # Metadata is git based | ||
22 | #METADATA_REVISION = "${@base_get_metadata_git_revision(d)}" | ||
23 | #FIXME | ||
24 | METADATA_REVISION = "unknown" | ||
25 | |||
26 | #IPK_FEED_URIS += " \ | ||
27 | # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ | ||
28 | #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ | ||
29 | # machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ | ||
30 | # base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ | ||
31 | # libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ | ||
32 | # console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ | ||
33 | # devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" | ||
34 | |||
35 | #RPM_FEED_URIS += " \ | ||
36 | # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ | ||
37 | #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ | ||
38 | # machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ | ||
39 | # base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ | ||
40 | # libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ | ||
41 | # console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ | ||
42 | # devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" | ||
43 | |||
44 | OEINCLUDELOGS = "yes" | ||
45 | KERNEL_CONSOLE = "ttyS0" | ||
46 | #DEBUG_OPTIMIZATION = "-O -g3" | ||
47 | #DEBUG_BUILD = "1" | ||
48 | #INHIBIT_PACKAGE_STRIP = "1" | ||
49 | |||
50 | # Default to TARGETOS values for EABI | ||
51 | GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" | ||
52 | UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" | ||
53 | |||
54 | POKYMODE ?= "moblin" | ||
55 | require conf/distro/include/poky-${POKYMODE}.inc | ||
56 | |||
57 | POKYLIBC ?= "glibc" | ||
58 | require conf/distro/include/poky-${POKYLIBC}.inc | ||
59 | |||
60 | SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}" | ||
61 | SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" | ||
62 | |||
63 | CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" | ||
64 | |||
65 | # | ||
66 | # Preferred providers: | ||
67 | # | ||
68 | |||
69 | # Virtuals: | ||
70 | PREFERRED_PROVIDER_virtual/db ?= "db" | ||
71 | PREFERRED_PROVIDER_virtual/db-native ?= "db-native" | ||
72 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" | ||
73 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" | ||
74 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" | ||
75 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" | ||
76 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" | ||
77 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" | ||
78 | PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel | ||
79 | |||
80 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" | ||
81 | |||
82 | # Others: | ||
83 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" | ||
84 | PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" | ||
85 | PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" | ||
86 | PREFERRED_PROVIDER_gconf ?= "gconf-dbus" | ||
87 | PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" | ||
88 | PREFERRED_PROVIDER_opkg ?= "opkg" | ||
89 | |||
90 | require conf/distro/include/poky-fixed-revisions.inc | ||
91 | require conf/distro/include/preferred-xorg-versions.inc | ||
92 | |||
93 | PCMCIA_MANAGER ?= "pcmciautils" | ||
94 | |||
95 | CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" | ||
96 | |||
97 | IMAGE_LINGUAS ?= "en-gb" | ||
98 | LIMIT_BUILT_LOCALES ?= "en_GB" | ||
99 | ENABLE_BINARY_LOCALE_GENERATION ?= "1" | ||
100 | LOCALE_UTF8_ONLY = "1" | ||
101 | |||
102 | DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" | ||
103 | |||
104 | POKY_EXTRA_RDEPENDS = "" | ||
105 | POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" | ||
106 | POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" | ||
107 | POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" | ||
108 | POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" | ||
109 | |||
110 | DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" | ||
111 | DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" | ||
112 | |||
113 | IMAGE_FEATURES ?= "" | ||
114 | |||
115 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
1 | DESCRIPTION = "Netbook Bootable Live Image" | 5 | DESCRIPTION = "Netbook Bootable Live Image" |
2 | 6 | ||
3 | require moblin-image-live.inc | 7 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
1 | AUTO_SYSLINUXCFG = "1" | 5 | AUTO_SYSLINUXCFG = "1" |
2 | INITRD = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz" | 6 | INITRD = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz" |
3 | APPEND += "root=/dev/ram0 " | 7 | 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 @@ | |||
1 | # Simple initramfs image. Mostly used for live images. | 1 | # |
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Simple initramfs image. Mostly used for live images." | ||
2 | 6 | ||
3 | IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev" | 7 | IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev" |
4 | 8 | ||
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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
1 | DESCRIPTION = "Minimal Bootable Live Image" | 5 | DESCRIPTION = "Minimal Bootable Live Image" |
2 | 6 | ||
3 | require moblin-image-live.inc | 7 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
5 | IMAGE_INSTALL = "task-moblin-boot ${ROOTFS_PKGMANAGE}" | ||
6 | |||
7 | IMAGE_LINGUAS = " " | ||
8 | |||
9 | inherit moblin-image | ||
10 | |||
11 | # remove not needed ipkg informations | ||
12 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Netbook Bootable Live Image" | ||
6 | |||
7 | require moblin-image-live.inc | ||
8 | |||
9 | LABELS += "install" | ||
10 | |||
11 | ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3" | ||
12 | |||
13 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Netbook Bootable Live Image" | ||
6 | |||
7 | require moblin-image-live.inc | ||
8 | |||
9 | LABELS += "boot install" | ||
10 | |||
11 | ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3" | ||
12 | |||
13 | 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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007 OpenedHand Ltd. | 2 | # Copyright (C) 2008 Intel Corporation. |
3 | # | 3 | # |
4 | 4 | ||
5 | IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}" | 5 | 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 @@ | |||
1 | DESCRIPTION = "Sato Bootable Live Image" | ||
2 | |||
3 | require moblin-image-live.inc | ||
4 | |||
5 | LABELS += "boot install" | ||
6 | |||
7 | ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-sato-${MACHINE}.ext3" | ||
8 | |||
9 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2007 OpenedHand Ltd. | ||
3 | # | ||
4 | |||
5 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" | ||
6 | |||
7 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
1 | DESCRIPTION = "Bootable Live SDK Image" | 5 | DESCRIPTION = "Bootable Live SDK Image" |
2 | 6 | ||
3 | require moblin-image-live.inc | 7 | 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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007 OpenedHand Ltd. | 2 | # Copyright (C) 2008 Intel Corporation. |
3 | # | 3 | # |
4 | 4 | ||
5 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs dbg-pkgs" | 5 | 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 @@ | |||
1 | DESCRIPTION = "Netbook Bootable Live Image" | ||
2 | |||
3 | require poky-image-live.inc | ||
4 | |||
5 | LABELS += "boot install" | ||
6 | |||
7 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3" | ||
8 | |||
9 | 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 @@ | |||
1 | AUTO_SYSLINUXCFG = "1" | ||
2 | INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz" | ||
3 | APPEND += "root=/dev/ram0 " | ||
4 | TIMEOUT = "10" | ||
5 | |||
6 | EXCLUDE_FROM_WORLD = "1" | ||
7 | |||
8 | do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs" | ||
9 | |||
10 | inherit bootimg | ||
11 | |||
12 | do_bootimg_prepend () { | ||
13 | import bb | ||
14 | fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) | ||
15 | if 'ext3' not in fstypes: | ||
16 | bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") | ||
17 | } | ||
18 | |||
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 @@ | |||
1 | # Simple initramfs image. Mostly used for live images. | ||
2 | |||
3 | IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev" | ||
4 | |||
5 | export IMAGE_BASENAME = "poky-image-minimal-initramfs" | ||
6 | IMAGE_LINGUAS = "" | ||
7 | |||
8 | 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 @@ | |||
1 | DESCRIPTION = "Minimal Bootable Live Image" | ||
2 | |||
3 | require poky-image-live.inc | ||
4 | |||
5 | LABELS += "boot install" | ||
6 | |||
7 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" | ||
8 | |||
9 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2007 OpenedHand Ltd. | ||
3 | # | ||
4 | |||
5 | IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}" | ||
6 | |||
7 | 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 @@ | |||
1 | DESCRIPTION = "Sato Bootable Live Image" | ||
2 | |||
3 | require poky-image-live.inc | ||
4 | |||
5 | LABELS += "boot install" | ||
6 | |||
7 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3" | ||
8 | |||
9 | 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 @@ | |||
1 | DESCRIPTION = "Bootable Live SDK Image" | ||
2 | |||
3 | require poky-image-live.inc | ||
4 | |||
5 | LABELS += "boot install" | ||
6 | |||
7 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sdk-${MACHINE}.ext3" | ||
8 | |||
9 | 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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007-2008 OpenedHand Ltd. | 2 | # Copyright (C) 2008 Intel Corporation. |
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTION = "X11 Pimlico Appications List" | 5 | 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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007 OpenedHand Ltd. | 2 | # Copyright (C) 2008 Intel Corporation. |
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTION = "Task for Moblin - minimal bootable image" | 5 | 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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007 OpenedHand Ltd. | 2 | # Copyright (C) 2008 Intel Corporation. |
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTON = "Software Development Tasks for Moblin" | 5 | 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 @@ | |||
1 | DESCRIPTION = "Target packages for the standalone SDK" | 1 | # |
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Target packages for the standalone Moblin SDK" | ||
2 | PR = "r4" | 6 | PR = "r4" |
3 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
4 | ALLOW_EMPTY = "1" | 8 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 OpenedHand Ltd. | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Tools tasks for Moblin" | ||
6 | PR = "r1" | ||
7 | |||
8 | PACKAGES = "\ | ||
9 | task-moblin-tools-debug \ | ||
10 | task-moblin-tools-debug-dbg \ | ||
11 | task-moblin-tools-debug-dev \ | ||
12 | task-moblin-tools-profile \ | ||
13 | task-moblin-tools-profile-dbg \ | ||
14 | task-moblin-tools-profile-dev \ | ||
15 | task-moblin-tools-testapps \ | ||
16 | task-moblin-tools-testapps-dbg \ | ||
17 | task-moblin-tools-testapps-dev \ | ||
18 | " | ||
19 | |||
20 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
21 | |||
22 | ALLOW_EMPTY = "1" | ||
23 | |||
24 | RDEPENDS_task-moblin-tools-debug = "\ | ||
25 | gdb \ | ||
26 | gdbserver \ | ||
27 | strace" | ||
28 | |||
29 | RDEPENDS_task-moblin-tools-profile = "\ | ||
30 | exmap-console \ | ||
31 | exmap-server \ | ||
32 | oprofile \ | ||
33 | oprofileui-server \ | ||
34 | powertop \ | ||
35 | lttng-control \ | ||
36 | lttng-viewer \ | ||
37 | sreadahead" | ||
38 | |||
39 | RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind" | ||
40 | |||
41 | RRECOMMENDS_task-moblin-tools-profile = "\ | ||
42 | kernel-module-oprofile" | ||
43 | |||
44 | RDEPENDS_task-moblin-tools-testapps = "\ | ||
45 | blktool \ | ||
46 | tslib-calibrate \ | ||
47 | tslib-tests \ | ||
48 | lrzsz \ | ||
49 | kexec-tools \ | ||
50 | alsa-utils-amixer \ | ||
51 | alsa-utils-aplay \ | ||
52 | owl-video \ | ||
53 | gst-meta-video \ | ||
54 | gst-meta-audio \ | ||
55 | xrestop \ | ||
56 | xwininfo \ | ||
57 | xprop \ | ||
58 | 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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2008 OpenedHand Ltd. | 2 | # Copyright (C) 2008 Intel Corporation. |
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTION = "Tools tasks for Moblin" | 5 | DESCRIPTION = "Debuggin and profiling tools tasks for Moblin" |
6 | PR = "r1" | 6 | PR = "r2" |
7 | 7 | ||
8 | PACKAGES = "\ | 8 | PACKAGES = "\ |
9 | task-moblin-tools-debug \ | 9 | task-moblin-tools-debug \ |
@@ -27,13 +27,14 @@ RDEPENDS_task-moblin-tools-debug = "\ | |||
27 | strace" | 27 | strace" |
28 | 28 | ||
29 | RDEPENDS_task-moblin-tools-profile = "\ | 29 | RDEPENDS_task-moblin-tools-profile = "\ |
30 | exmap-console \ | 30 | # exmap-console \ |
31 | exmap-server \ | 31 | # exmap-server \ |
32 | oprofile \ | 32 | oprofile \ |
33 | oprofileui-server \ | 33 | oprofileui-server \ |
34 | powertop \ | 34 | powertop \ |
35 | lttng-control \ | 35 | lttng-control \ |
36 | lttng-viewer" | 36 | lttng-viewer" |
37 | # sreadahead" | ||
37 | 38 | ||
38 | RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind" | 39 | RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind" |
39 | 40 | ||
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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2008 Intel. | 2 | # Copyright (C) 2008 Intel Corporation. |
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTION = "Netbook Tasks for Moblin" | 5 | DESCRIPTION = "Netbook GUI Tasks for Moblin" |
6 | PR = "r0" | 6 | PR = "r0" |
7 | 7 | ||
8 | PACKAGES = "\ | 8 | 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 @@ | |||
1 | # | ||
2 | # Copyright (C) 2007-2008 OpenedHand Ltd. | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Sato Tasks for Moblin" | ||
6 | PR = "r29" | ||
7 | |||
8 | PACKAGES = "\ | ||
9 | task-moblin-x11-sato \ | ||
10 | task-moblin-x11-sato-dbg \ | ||
11 | task-moblin-x11-sato-dev \ | ||
12 | " | ||
13 | |||
14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
15 | |||
16 | ALLOW_EMPTY = "1" | ||
17 | |||
18 | NETWORK_MANAGER ?= "networkmanager-applet" | ||
19 | RDEPENDS_task-moblin-x11-sato = "\ | ||
20 | matchbox-desktop \ | ||
21 | matchbox-session-sato \ | ||
22 | matchbox-keyboard \ | ||
23 | matchbox-stroke \ | ||
24 | matchbox-config-gtk \ | ||
25 | xcursor-transparent-theme \ | ||
26 | sato-icon-theme \ | ||
27 | settings-daemon \ | ||
28 | gtk-sato-engine \ | ||
29 | ${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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007-2008 OpenedHand Ltd. | 2 | # Copyright (C) 2008 Intel Corporation. |
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTION = "Tasks for Moblin" | 5 | DESCRIPTION = "Tasks for Moblin" |