From 8eba44660e495702fc68244fba64b6f08c1c9418 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 30 Aug 2012 12:04:18 +0100 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/core-image.bbclass | 6 +-- .../images/build-appliance-image.bb | 2 +- .../packagegroup-core-x11-base.bb | 18 ++++++++ .../packagegroups/packagegroup-core-x11.bb} | 24 +++++----- meta/recipes-sato/images/core-image-sato.bb | 2 + .../packagegroups/packagegroup-core-x11.bb | 45 ------------------- 6 files changed, 37 insertions(+), 60 deletions(-) create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb rename meta/{recipes-sato/packagegroups/packagegroup-core-x11-mini.bb => recipes-graphics/packagegroups/packagegroup-core-x11.bb} (78%) delete mode 100644 meta/recipes-sato/packagegroups/packagegroup-core-x11.bb diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index f748552d39..a23d3c8c7e 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -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" diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb index 42d643634d..be4d6abfe9 100644 --- a/meta/recipes-core/images/build-appliance-image.bb +++ b/meta/recipes-core/images/build-appliance-image.bb @@ -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" diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb new file mode 100644 index 0000000000..eb4b27dc4c --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb @@ -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 \ + " diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb similarity index 78% rename from meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb rename to meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index 432d99d0ca..9563de0783 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -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 \ + " diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index 76f90817ad..6b6c7611bc 100644 --- a/meta/recipes-sato/images/core-image-sato.bb +++ b/meta/recipes-sato/images/core-image-sato.bb @@ -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" diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb deleted file mode 100644 index b69cc50d33..0000000000 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb +++ /dev/null @@ -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"