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

packagegroup-core-x11*: adjust X11 package groups 

Now the Sato pieces have been moved out, rebase packagegroup-core-x11 on
packagegroup-x11-mini but using the structure/contents of meta-oe's
task-x11 so that it can replace that; rename packagegroup-core-x11-mini
to packagegroup-core-x11-base and pull in the xserver/utils packages via
packagegroup-core-x11, and move both of these recipes under
recipes-graphics.

x11-mini is renamed to x11-base as it's what people should build on top
of and since x11-mini is newer, the corresponding IMAGE_FEATURES item is
less likely to be used in existing user recipes.

(From OE-Core rev: 0cc9ced7d96b960994b0671095bc74becfc55e2c)

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 12:04:18 +01:00 committed by Richard Purdie
parent d56f6af12c
commit 8eba44660e
6 changed files with 37 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# Available IMAGE_FEATURES:
#
# - apps-console-core
# - x11-mini - minimal environment for X11 server
# - x11-base - X11 server + minimal desktop
# - x11 - X server
# - x11-base - X server with minimal environment
# - x11-sato - OpenedHand Sato environment
# - tools-sdk - SDK
# - tools-debug - debugging tools
@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - debug-tweaks - makes an image suitable for development
#
PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
PACKAGE_GROUP_x11 = "packagegroup-core-x11"
PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"

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

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r16"
IMAGE_FEATURES += "x11-mini package-management"
IMAGE_FEATURES += "x11-base package-management"
# Ensure there's enough space to do a core-image-sato build, with rm_work enabled
IMAGE_ROOTFS_EXTRA_SPACE = "41943040"

18
meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb Normal file
View File

@ -0,0 +1,18 @@
DESCRIPTION = "Tasks for core X11 applications"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r0"
inherit packagegroup
RDEPENDS_${PN} = "\
packagegroup-core-x11-xserver \
packagegroup-core-x11-utils \
dbus \
pointercal \
matchbox-terminal \
matchbox-wm \
mini-x-session \
liberation-fonts \
"

24
meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb → meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
View File

@ -6,15 +6,15 @@ DESCRIPTION = "Tasks for core X11 applications"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r1"
PR = "r36"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
PACKAGES = "${PN} ${PN}-xserver ${PN}-utils"
ROOTLESS_X = "1"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
# xserver-common, x11-common
VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
@ -22,18 +22,20 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
# elsa, xserver-nodm-init
VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
RDEPENDS_${PN} = "\
${PN}-xserver \
${PN}-utils \
"
RDEPENDS_packagegroup-core-x11-mini = "\
dbus \
pointercal \
matchbox-terminal \
matchbox-wm \
mini-x-session \
RDEPENDS_${PN}-xserver = "\
${XSERVER} \
"
RDEPENDS_${PN}-utils = "\
${VIRTUAL-RUNTIME_xserver_common} \
${VIRTUAL-RUNTIME_graphical_init_manager} \
liberation-fonts \
xauth \
xhost \
xset \
xrandr"
xrandr \
"

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

@ -7,3 +7,5 @@ IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-se
LICENSE = "MIT"
inherit core-image
IMAGE_INSTALL += "packagegroup-core-x11-sato-games"

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

@ -1,45 +0,0 @@
#
# Copyright (C) 2011 Intel Corporation
#
DESCRIPTION = "Tasks for core X11 applications"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r36"
inherit packagegroup
PACKAGES = "\
packagegroup-core-x11-base \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
# xserver-common, x11-common
VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
# elsa, xserver-nodm-init
VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
RDEPENDS_packagegroup-core-x11-base = "\
dbus \
pointercal \
matchbox-wm \
matchbox-keyboard \
matchbox-keyboard-applet \
matchbox-keyboard-im \
matchbox-panel-2 \
matchbox-desktop \
matchbox-session \
${XSERVER} \
${VIRTUAL-RUNTIME_xserver_common} \
${VIRTUAL-RUNTIME_graphical_init_manager} \
liberation-fonts \
xauth \
xhost \
xset \
xrandr"