sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Paul Eggleton 2012-08-30 11:48:50 +01:00 committed by Richard Purdie
parent 9bb6f42763
commit ce1f15059a
6 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/core-image.bbclass
View File

@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - x11-mini - minimal environment for X11 server
# - x11-base - X11 server + minimal desktop
# - x11-sato - OpenedHand Sato environment
# - apps-x11-core - X Terminal, file manager, file editor
# - apps-x11-games
# - tools-sdk - SDK
# - tools-debug - debugging tools
# - tools-profile - profiling tools
@ -31,8 +29,6 @@ PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
PACKAGE_GROUP_apps-x11-core = "packagegroup-core-apps-x11-core"
PACKAGE_GROUP_apps-x11-games = "packagegroup-core-apps-x11-games"
PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile"
PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps"

5
meta/recipes-core/images/core-image-core.bb
View File

@ -1,7 +1,6 @@
DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
and file manager."
DESCRIPTION = "A very basic X11 image with a terminal"
IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core"
IMAGE_FEATURES += "apps-console-core package-management x11-base"
LICENSE = "MIT"

2
meta/recipes-graphics/images/core-image-clutter.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
which enables development of rich and animated graphical user interfaces."
IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
LICENSE = "MIT"

2
meta/recipes-sato/images/core-image-sato.bb
View File

@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
mobile devices. The image supports X11 with a Sato theme, Pimlico \
applications, and contains terminal, editor, and file manager."
IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
LICENSE = "MIT"

40
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
View File

@ -12,25 +12,51 @@ inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
RDEPENDS_${PN} = "\
${PN}-base \
${PN}-apps \
${PN}-games \
"
NETWORK_MANAGER ?= "connman-gnome"
NETWORK_MANAGER_libc-uclibc = ""
WEB ?= ""
#WEB = "web-webkit"
RDEPENDS_packagegroup-core-x11-sato = "\
RDEPENDS_${PN}-base = "\
matchbox-desktop \
matchbox-session-sato \
matchbox-keyboard \
matchbox-keyboard-applet \
matchbox-keyboard-im \
matchbox-stroke \
matchbox-config-gtk \
xcursor-transparent-theme \
sato-icon-theme \
settings-daemon \
gtk-sato-engine \
gthumb \
x11vnc \
libsdl \
${NETWORK_MANAGER} \
"
# pcmanfm doesn't work on mips
FILEMANAGER ?= "pcmanfm"
FILEMANAGER_mips ?= ""
WEB ?= ""
#WEB = "web-webkit"
RDEPENDS_${PN}-apps = "\
gthumb \
leafpad \
gaku \
x11vnc \
matchbox-terminal \
sato-screenshot \
${FILEMANAGER} \
${WEB} \
${NETWORK_MANAGER}"
"
RDEPENDS_${PN}-games = "\
oh-puzzles \
"

17
meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
View File

@ -11,8 +11,6 @@ PR = "r36"
inherit packagegroup
PACKAGES = "\
packagegroup-core-apps-x11-core \
packagegroup-core-apps-x11-games \
packagegroup-core-x11-base \
"
@ -20,10 +18,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
# pcmanfm doesn't work on mips/powerpc
FILEMANAGER ?= "pcmanfm"
FILEMANAGER_mips ?= ""
# xserver-common, x11-common
VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
@ -49,14 +43,3 @@ RDEPENDS_packagegroup-core-x11-base = "\
xhost \
xset \
xrandr"
RDEPENDS_packagegroup-core-apps-x11-core = "\
leafpad \
${FILEMANAGER} \
matchbox-terminal \
sato-screenshot"
RDEPENDS_packagegroup-core-apps-x11-games = "\
oh-puzzles"