summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-08-30 11:48:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:52:57 +0100
commitce1f15059aa11b1613aff01a9b0ac1fdedaa59f6 (patch)
treec26edb2832d866031553d6b485ae515c0df5f1e1 /meta
parent9bb6f42763d7c3aa4d59ac08b2b4252d2e2b00a2 (diff)
downloadpoky-ce1f15059aa11b1613aff01a9b0ac1fdedaa59f6.tar.gz
packagegroup-core-x11: move out Sato applications
Move Sato applications to packagegroup-core-x11-sato. Note that this eliminates both the apps-x11-core and apps-x11-games IMAGE_FEATURES; in practice it is unlikely these were useful to anyone outside of the Sato images however. (From OE-Core rev: 46cc375f29d5ecac7311613514a474f288d7c781) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/core-image.bbclass4
-rw-r--r--meta/recipes-core/images/core-image-core.bb5
-rw-r--r--meta/recipes-graphics/images/core-image-clutter.bb2
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb2
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb40
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11.bb17
6 files changed, 37 insertions, 33 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index a85a9ea456..f748552d39 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
16# - x11-mini - minimal environment for X11 server 16# - x11-mini - minimal environment for X11 server
17# - x11-base - X11 server + minimal desktop 17# - x11-base - X11 server + minimal desktop
18# - x11-sato - OpenedHand Sato environment 18# - x11-sato - OpenedHand Sato environment
19# - apps-x11-core - X Terminal, file manager, file editor
20# - apps-x11-games
21# - tools-sdk - SDK 19# - tools-sdk - SDK
22# - tools-debug - debugging tools 20# - tools-debug - debugging tools
23# - tools-profile - profiling tools 21# - tools-profile - profiling tools
@@ -31,8 +29,6 @@ PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
31PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini" 29PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
32PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base" 30PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
33PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato" 31PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
34PACKAGE_GROUP_apps-x11-core = "packagegroup-core-apps-x11-core"
35PACKAGE_GROUP_apps-x11-games = "packagegroup-core-apps-x11-games"
36PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug" 32PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
37PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile" 33PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile"
38PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps" 34PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps"
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb
index ea6ba7ecad..73a707d87c 100644
--- a/meta/recipes-core/images/core-image-core.bb
+++ b/meta/recipes-core/images/core-image-core.bb
@@ -1,7 +1,6 @@
1DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \ 1DESCRIPTION = "A very basic X11 image with a terminal"
2and file manager."
3 2
4IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core" 3IMAGE_FEATURES += "apps-console-core package-management x11-base"
5 4
6LICENSE = "MIT" 5LICENSE = "MIT"
7 6
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 4c5adee48e..84ceb277be 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \ 1DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
2which enables development of rich and animated graphical user interfaces." 2which enables development of rich and animated graphical user interfaces."
3 3
4IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear" 4IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
5 5
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 4bbf099c43..76f90817ad 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
2mobile devices. The image supports X11 with a Sato theme, Pimlico \ 2mobile devices. The image supports X11 with a Sato theme, Pimlico \
3applications, and contains terminal, editor, and file manager." 3applications, and contains terminal, editor, and file manager."
4 4
5IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear" 5IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index f38e0d2800..b31eabad11 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -12,25 +12,51 @@ inherit packagegroup
12 12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 13PACKAGE_ARCH = "${MACHINE_ARCH}"
14 14
15PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
16
17RDEPENDS_${PN} = "\
18 ${PN}-base \
19 ${PN}-apps \
20 ${PN}-games \
21 "
22
15NETWORK_MANAGER ?= "connman-gnome" 23NETWORK_MANAGER ?= "connman-gnome"
16NETWORK_MANAGER_libc-uclibc = "" 24NETWORK_MANAGER_libc-uclibc = ""
17 25
18WEB ?= "" 26RDEPENDS_${PN}-base = "\
19#WEB = "web-webkit"
20
21RDEPENDS_packagegroup-core-x11-sato = "\
22 matchbox-desktop \ 27 matchbox-desktop \
23 matchbox-session-sato \ 28 matchbox-session-sato \
24 matchbox-keyboard \ 29 matchbox-keyboard \
30 matchbox-keyboard-applet \
31 matchbox-keyboard-im \
25 matchbox-stroke \ 32 matchbox-stroke \
26 matchbox-config-gtk \ 33 matchbox-config-gtk \
27 xcursor-transparent-theme \ 34 xcursor-transparent-theme \
28 sato-icon-theme \ 35 sato-icon-theme \
29 settings-daemon \ 36 settings-daemon \
30 gtk-sato-engine \ 37 gtk-sato-engine \
31 gthumb \
32 x11vnc \
33 libsdl \ 38 libsdl \
39 ${NETWORK_MANAGER} \
40 "
41
42# pcmanfm doesn't work on mips
43FILEMANAGER ?= "pcmanfm"
44FILEMANAGER_mips ?= ""
45
46WEB ?= ""
47#WEB = "web-webkit"
48
49RDEPENDS_${PN}-apps = "\
50 gthumb \
51 leafpad \
34 gaku \ 52 gaku \
53 x11vnc \
54 matchbox-terminal \
55 sato-screenshot \
56 ${FILEMANAGER} \
35 ${WEB} \ 57 ${WEB} \
36 ${NETWORK_MANAGER}" 58 "
59
60RDEPENDS_${PN}-games = "\
61 oh-puzzles \
62 "
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
index 3fe5caee93..b69cc50d33 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
@@ -11,8 +11,6 @@ PR = "r36"
11inherit packagegroup 11inherit packagegroup
12 12
13PACKAGES = "\ 13PACKAGES = "\
14 packagegroup-core-apps-x11-core \
15 packagegroup-core-apps-x11-games \
16 packagegroup-core-x11-base \ 14 packagegroup-core-x11-base \
17 " 15 "
18 16
@@ -20,10 +18,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
20 18
21XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" 19XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
22 20
23# pcmanfm doesn't work on mips/powerpc
24FILEMANAGER ?= "pcmanfm"
25FILEMANAGER_mips ?= ""
26
27# xserver-common, x11-common 21# xserver-common, x11-common
28VIRTUAL-RUNTIME_xserver_common ?= "x11-common" 22VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
29 23
@@ -49,14 +43,3 @@ RDEPENDS_packagegroup-core-x11-base = "\
49 xhost \ 43 xhost \
50 xset \ 44 xset \
51 xrandr" 45 xrandr"
52
53
54RDEPENDS_packagegroup-core-apps-x11-core = "\
55 leafpad \
56 ${FILEMANAGER} \
57 matchbox-terminal \
58 sato-screenshot"
59
60
61RDEPENDS_packagegroup-core-apps-x11-games = "\
62 oh-puzzles"