summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/poky-image.bbclass9
-rw-r--r--meta/packages/images/poky-image-netbook-live.bb8
-rw-r--r--meta/packages/images/poky-image-netbook.bb7
-rw-r--r--meta/packages/images/poky-image-sato-live.bb1
-rw-r--r--meta/packages/matchbox-netbook/matchbox-session-netbook/session22
-rw-r--r--meta/packages/matchbox-netbook/matchbox-session-netbook_0.1.bb43
-rw-r--r--meta/packages/tasks/task-poky-x11-netbook.bb27
7 files changed, 116 insertions, 1 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index e72d17ead1..fe04d54a6e 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -12,6 +12,7 @@
12# - apps-console-core 12# - apps-console-core
13# - x11-base - X11 server + minimal desktop 13# - x11-base - X11 server + minimal desktop
14# - x11-sato - OpenedHand Sato environment 14# - x11-sato - OpenedHand Sato environment
15# - x11-netbook - Metacity based environment for netbooks
15# - apps-x11-core - X Terminal, file manager, file editor 16# - apps-x11-core - X Terminal, file manager, file editor
16# - apps-x11-games 17# - apps-x11-games
17# - apps-x11-pimlico - OpenedHand Pimlico apps 18# - apps-x11-pimlico - OpenedHand Pimlico apps
@@ -42,6 +43,9 @@ POKY_BASE_INSTALL = '\
42 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-poky-x11-sato-dbg", "",d)} \ 43 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-poky-x11-sato-dbg", "",d)} \
43 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-poky-x11-sato-dev", "",d)} \ 44 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-poky-x11-sato-dev", "",d)} \
44 \ 45 \
46 ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-poky-x11-netbook", "", d)} \
47 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-poky-x11-netbook-dbg", "", d)} \
48 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-poky-x11-netbook-dev", "", d)} \
45 ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-poky-apps-x11-core", "",d)} \ 49 ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-poky-apps-x11-core", "",d)} \
46 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-poky-apps-x11-core-dbg", "",d)} \ 50 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-poky-apps-x11-core-dbg", "",d)} \
47 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-poky-apps-x11-core-dev", "",d)} \ 51 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-poky-apps-x11-core-dev", "",d)} \
@@ -72,6 +76,7 @@ POKY_BASE_INSTALL = '\
72 \ 76 \
73 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ 77 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
74 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \ 78 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
79
75 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \ 80 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
76 \ 81 \
77 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \ 82 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \
@@ -83,7 +88,9 @@ POKY_EXTRA_INSTALL ?= ""
83IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" 88IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
84 89
85X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" 90X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
86SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico package-management" 91ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management"
92SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} apps-x11-sato"
93NETBOOK_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} apps-x11-netbook"
87 94
88inherit image 95inherit image
89 96
diff --git a/meta/packages/images/poky-image-netbook-live.bb b/meta/packages/images/poky-image-netbook-live.bb
new file mode 100644
index 0000000000..4a03015b79
--- /dev/null
+++ b/meta/packages/images/poky-image-netbook-live.bb
@@ -0,0 +1,8 @@
1DESCRIPTION = "Netbook Bootable Live Image"
2
3require poky-image-live.inc
4
5ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
6TIMEOUT = "3"
7
8do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta/packages/images/poky-image-netbook.bb b/meta/packages/images/poky-image-netbook.bb
new file mode 100644
index 0000000000..8138e9d598
--- /dev/null
+++ b/meta/packages/images/poky-image-netbook.bb
@@ -0,0 +1,7 @@
1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
4
5IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
6
7inherit poky-image
diff --git a/meta/packages/images/poky-image-sato-live.bb b/meta/packages/images/poky-image-sato-live.bb
index d69c252ee0..e2cc2c209f 100644
--- a/meta/packages/images/poky-image-sato-live.bb
+++ b/meta/packages/images/poky-image-sato-live.bb
@@ -3,5 +3,6 @@ DESCRIPTION = "Sato Bootable Live Image"
3require poky-image-live.inc 3require poky-image-live.inc
4 4
5ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3" 5ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
6TIMEOUT = "3"
6 7
7do_bootimg[depends] += "poky-image-sato:do_rootfs" 8do_bootimg[depends] += "poky-image-sato:do_rootfs"
diff --git a/meta/packages/matchbox-netbook/matchbox-session-netbook/session b/meta/packages/matchbox-netbook/matchbox-session-netbook/session
new file mode 100644
index 0000000000..bd6bdba4ac
--- /dev/null
+++ b/meta/packages/matchbox-netbook/matchbox-session-netbook/session
@@ -0,0 +1,22 @@
1#!/bin/sh
2
3. /etc/formfactor/config
4
5if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
6 SHOWCURSOR="no"
7else
8 SHOWCURSOR="yes"
9fi
10
11matchbox-desktop &
12
13# Lines containing feature-[foo] are removed at build time if the machine
14# doesn't have the feature "foo".
15
16START_APPLETS=showdesktop,windowselector
17END_APPLETS=clock,battery,systray,startup-notify,notify
18END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
19
20matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &
21
22exec metacity
diff --git a/meta/packages/matchbox-netbook/matchbox-session-netbook_0.1.bb b/meta/packages/matchbox-netbook/matchbox-session-netbook_0.1.bb
new file mode 100644
index 0000000000..19e77d8915
--- /dev/null
+++ b/meta/packages/matchbox-netbook/matchbox-session-netbook_0.1.bb
@@ -0,0 +1,43 @@
1DESCRIPTION = "Custom MB session files for poky"
2LICENSE = "GPL"
3SECTION = "x11"
4RDEPENDS = "formfactor gtk-engines gtk-theme-darkilouche matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session"
5PR = "r1"
6
7# This package is architecture specific because the session script is modified
8# based on the machine architecture.
9PACKAGE_ARCH = "${MACHINE_ARCH}"
10
11SRC_URI = "file://session"
12S = "${WORKDIR}"
13
14do_install() {
15 # This is the set of machine features that the script has markers for
16 FEATURES="phone"
17 SCRIPT="${S}/sedder"
18 rm -f $SCRIPT
19 touch $SCRIPT
20 for FEAT in $FEATURES; do
21 if echo ${MACHINE_FEATURES} | awk "/$FEAT/ {exit 1}"; then
22 echo "/feature-$FEAT/d" >> $SCRIPT
23 fi
24 done
25
26 install -d ${D}/${sysconfdir}/matchbox
27 sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session
28 chmod +x ${D}/${sysconfdir}/matchbox/session
29}
30
31pkg_postinst_${PN} () {
32#!/bin/sh -e
33if [ "x$D" != "x" ]; then
34 exit 1
35fi
36
37. ${sysconfdir}/init.d/functions
38
39gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato
40gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato
41gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/touchscreen true
42
43gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 10" \ No newline at end of file
diff --git a/meta/packages/tasks/task-poky-x11-netbook.bb b/meta/packages/tasks/task-poky-x11-netbook.bb
new file mode 100644
index 0000000000..5a6407a0ab
--- /dev/null
+++ b/meta/packages/tasks/task-poky-x11-netbook.bb
@@ -0,0 +1,27 @@
1#
2# Copyright (C) 2008 Intel.
3#
4
5DESCRIPTION = "Netbook Tasks for Poky"
6PR = "r0"
7
8PACKAGES = "\
9 task-poky-x11-netbook \
10 task-poky-x11-netbook-dbg \
11 task-poky-x11-netbook-dev \
12 "
13
14PACKAGE_ARCH = "${MACHINE_ARCH}"
15
16ALLOW_EMPTY = "1"
17
18NETWORK_MANAGER ?= "networkmanager-applet"
19RDEPENDS_task-poky-x11-netbook = "\
20 metacity-clutter \
21 matchbox-desktop \
22 matchbox-session-netbook \
23 matchbox-config-gtk \
24 xcursor-transparent-theme \
25 sato-icon-theme \
26 settings-daemon \
27 ${NETWORK_MANAGER}"