diff options
27 files changed, 52 insertions, 168 deletions
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index ea054bc9c9..ef05004e30 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -5,14 +5,13 @@ DESCRIPTION = "Host packages for the standalone SDK or external toolchain" PR = "r11" LICENSE = "MIT" -ALLOW_EMPTY = "1" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -inherit nativesdk +inherit nativesdk packagegroup -PACKAGES = "${PN}" +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} = "\ nativesdk-pkgconfig \ diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 85acd1fe72..7e2bd69f30 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -40,8 +40,6 @@ PACKAGES = ' \ \ ' -ALLOW_EMPTY = "1" - # # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH # diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 7e80fffe4a..b49fb3f291 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -6,11 +6,13 @@ DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" -ALLOW_EMPTY = "1" PR = "r9" +inherit packagegroup + +PACKAGE_ARCH = "${MACHINE_ARCH}" + # # Set by the machine configuration with packages essential for device bootup # @@ -24,13 +26,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit" VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" -PACKAGES = "\ - packagegroup-core-boot \ - packagegroup-core-boot-dbg \ - packagegroup-core-boot-dev \ -" - -RDEPENDS_packagegroup-core-boot = "\ +RDEPENDS_${PN} = "\ base-files \ base-passwd \ busybox \ @@ -45,5 +41,5 @@ RDEPENDS_packagegroup-core-boot = "\ ${VIRTUAL-RUNTIME_update-alternatives} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_packagegroup-core-boot = "\ +RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-console.bb b/meta/recipes-core/packagegroups/packagegroup-core-console.bb index fd8eb252db..63003d0b95 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-console.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-console.bb @@ -8,16 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r35" -PACKAGES = "\ - packagegroup-core-apps-console \ - packagegroup-core-apps-console-dbg \ - packagegroup-core-apps-console-dev \ - " +inherit packagegroup PACKAGE_ARCH = "${MACHINE_ARCH}" -ALLOW_EMPTY = "1" - SPLASH ?= "psplash" RDEPENDS_packagegroup-core-apps-console = "\ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb index 4b1059c9f2..8b2318ea66 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb @@ -8,15 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r1" -PACKAGES = "\ - packagegroup-core-nfs-server \ - packagegroup-core-nfs-server-dbg \ - packagegroup-core-nfs-server-dev \ - " +inherit packagegroup -ALLOW_EMPTY = "1" +PACKAGES = "${PN}-server" -RDEPENDS_packagegroup-core-nfs-server = "\ +RDEPENDS_${PN}-server = "\ nfs-utils \ nfs-utils-client \ " diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index 663f7057de..4ee802f9d9 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb @@ -9,13 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 DEPENDS = "packagegroup-core-console" PR = "r8" -ALLOW_EMPTY = "1" -#PACKAGEFUNCS =+ 'generate_sdk_pkgs' +inherit packagegroup -PACKAGES = "\ - packagegroup-core-sdk \ - packagegroup-core-sdk-dbg \ - packagegroup-core-sdk-dev" +#PACKAGEFUNCS =+ 'generate_sdk_pkgs' RDEPENDS_packagegroup-core-sdk = "\ autoconf \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb index 9dcc342dc4..a07e2badf9 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb @@ -4,14 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r0" -PACKAGES = "\ - packagegroup-core-ssh-dropbear \ - packagegroup-core-ssh-dropbear-dbg \ - packagegroup-core-ssh-dropbear-dev \ - " +inherit packagegroup -ALLOW_EMPTY = "1" - -RDEPENDS_packagegroup-core-ssh-dropbear = "dropbear" -RDEPENDS_packagegroup-core-ssh-dropbear-dbg = "dropbear-dbg" -RDEPENDS_packagegroup-core-ssh-dropbear-dev = "dropbear-dev" +RDEPENDS_${PN} = "dropbear" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb index 7e85b29ad8..89f8c93ec7 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb @@ -4,14 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r0" -PACKAGES = "\ - packagegroup-core-ssh-openssh \ - packagegroup-core-ssh-openssh-dbg \ - packagegroup-core-ssh-openssh-dev \ - " +inherit packagegroup -ALLOW_EMPTY = "1" - -RDEPENDS_packagegroup-core-ssh-openssh = "openssh" -RDEPENDS_packagegroup-core-ssh-openssh-dbg = "openssh-dbg" -RDEPENDS_packagegroup-core-ssh-openssh-dev = "openssh-dev" +RDEPENDS_${PN} = "openssh" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb index 03628a167d..d912018581 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb @@ -3,9 +3,8 @@ PR = "r7" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -ALLOW_EMPTY = "1" -PACKAGES = "${PN} ${PN}-dbg" +inherit packagegroup RDEPENDS_${PN} = "\ libgcc \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb index b7eff21622..be424a30ee 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb @@ -7,18 +7,12 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PACKAGES = "\ - ${PN} \ - ${PN}-dbg \ - ${PN}-dev \ - " +inherit packagegroup PR = "r1" PACKAGE_ARCH = "${MACHINE_ARCH}" -ALLOW_EMPTY = "1" - MTRACE = "" MTRACE_libc-glibc = "libc-mtrace" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 30776ef658..24a99c7eb9 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -7,16 +7,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PACKAGES = "\ - ${PN} \ - ${PN}-dbg \ - ${PN}-dev \ - " +inherit packagegroup PACKAGE_ARCH = "${MACHINE_ARCH}" -ALLOW_EMPTY = "1" - RRECOMMENDS_${PN} = "\ perf \ trace-cmd \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index bdd0d058f9..52c278a53c 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -7,16 +7,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PACKAGES = "\ - ${PN} \ - ${PN}-dbg \ - ${PN}-dev \ - " +inherit packagegroup PACKAGE_ARCH = "${MACHINE_ARCH}" -ALLOW_EMPTY = "1" - # kexec-tools doesn't work on Mips KEXECTOOLS ?= "kexec" KEXECTOOLS_mips ?= "" diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb index 6ab4a95846..8870ccc8c8 100644 --- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb @@ -2,13 +2,13 @@ DESCRIPTION = "Host SDK package for cross canadian toolchain" PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}" PR = "r0" LICENSE = "MIT" -ALLOW_EMPTY = "1" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -inherit cross-canadian -PACKAGES = "${PN}" +inherit cross-canadian packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} = "\ binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \ diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 118ff7d48b..7567457d2e 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -8,6 +8,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit packagegroup + PACKAGES = "\ packagegroup-self-hosted \ packagegroup-self-hosted-debug \ @@ -17,8 +19,6 @@ PACKAGES = "\ packagegroup-self-hosted-host-tools \ " -ALLOW_EMPTY = "1" - RDEPENDS_packagegroup-self-hosted = "\ packagegroup-self-hosted-debug \ packagegroup-self-hosted-sdk \ diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb index a7e3eb75c5..95edd7835f 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb @@ -8,38 +8,21 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit packagegroup + PACKAGES = "\ packagegroup-core-basic \ packagegroup-core-base-utils \ - packagegroup-core-base-utils-dbg \ - packagegroup-core-base-utils-dev \ packagegroup-core-basic-libs \ - packagegroup-core-basic-libs-dbg \ - packagegroup-core-basic-libs-dev \ packagegroup-core-basic-utils \ - packagegroup-core-basic-utils-dbg \ - packagegroup-core-basic-utils-dev \ packagegroup-core-basic-extended \ - packagegroup-core-basic-extended-dbg \ - packagegroup-core-basic-extended-dev \ packagegroup-core-dev-utils \ - packagegroup-core-dev-utils-dbg \ - packagegroup-core-dev-utils-dev \ packagegroup-core-multiuser \ - packagegroup-core-multiuser-dbg \ - packagegroup-core-multiuser-dev \ packagegroup-core-initscripts \ - packagegroup-core-initscripts-dbg \ - packagegroup-core-initscripts-dev \ packagegroup-core-rpm \ - packagegroup-core-rpm-dbg \ - packagegroup-core-rpm-dev \ packagegroup-core-sys-services \ - packagegroup-core-sys-services-dbg \ - packagegroup-core-sys-services-dev \ " -ALLOW_EMPTY = "1" RDEPENDS_packagegroup-core-basic = "\ packagegroup-core-base-utils \ diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 984ed36940..558db00be6 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -8,26 +8,16 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit packagegroup + PACKAGES = "\ packagegroup-core-lsb \ packagegroup-core-sys-extended \ - packagegroup-core-sys-extended-dbg \ - packagegroup-core-sys-extended-dev \ packagegroup-core-db \ - packagegroup-core-db-dbg \ - packagegroup-core-db-dev \ packagegroup-core-misc \ - packagegroup-core-misc-dbg \ - packagegroup-core-misc-dev \ packagegroup-core-perl \ - packagegroup-core-perl-dbg \ - packagegroup-core-perl-dev \ packagegroup-core-python \ - packagegroup-core-python-dbg \ - packagegroup-core-python-dev \ packagegroup-core-tcl \ - packagegroup-core-tcl-dbg \ - packagegroup-core-tcl-dev \ packagegroup-core-lsb-perl-add \ packagegroup-core-lsb-python-add \ packagegroup-core-lsb-graphic-add \ @@ -36,8 +26,6 @@ PACKAGES = "\ " -ALLOW_EMPTY = "1" - RDEPENDS_packagegroup-core-lsb = "\ packagegroup-core-sys-extended \ packagegroup-core-db \ diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb index a00ca36901..45cffa4b76 100644 --- a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb +++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb @@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r12" -ALLOW_EMPTY = "1" +inherit packagegroup require packagegroup-sdk-gmae.inc -PACKAGES = "${PN}" +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} = "\ packagegroup-core-sdk \ diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb index 3b2abddcdc..79b3253a75 100644 --- a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb +++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb @@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r14" -ALLOW_EMPTY = "1" +inherit packagegroup require packagegroup-sdk-gmae.inc -PACKAGES = "${PN} ${PN}-dbg" +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} = "\ packagegroup-core-standalone-sdk-target \ diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index 039f5c6914..d6ac4f33a0 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -9,20 +9,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PR = "r4" +inherit packagegroup + PACKAGES = "\ packagegroup-core-clutter-core \ - packagegroup-core-clutter-core-dbg \ - packagegroup-core-clutter-core-dev \ packagegroup-core-clutter-apps \ - packagegroup-core-clutter-apps-dbg \ - packagegroup-core-clutter-apps-dev \ packagegroup-core-clutter-tests \ - packagegroup-core-clutter-tests-dbg \ - packagegroup-core-clutter-tests-dev \ " -ALLOW_EMPTY = "1" - RDEPENDS_packagegroup-core-clutter-core = "\ clutter-1.8 \ clutter-gst-1.8 \ diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb index 8609013e9e..0c47b6fbcd 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb @@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 inherit packagegroup -TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' +PACKAGES = "${PN}-base" -PACKAGES += " \ - ${PN}-base \ -" +TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' RDEPENDS_${PN}-base = " \ directfb \ diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb index 1c53a9ce2a..a3c275fd97 100644 --- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb +++ b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb @@ -2,6 +2,5 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb DESCRIPTION = "Host packages for Qt Embedded SDK" LICENSE = "MIT" -ALLOW_EMPTY = "1" RDEPENDS_${PN} += "nativesdk-qt4-tools" diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb index 4fe07c654e..ec5e94bf76 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb @@ -8,15 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r3" -PACKAGES = "\ - packagegroup-core-qt-demos \ - packagegroup-core-qt-demos-dbg \ - packagegroup-core-qt-demos-dev \ - " +inherit packagegroup -ALLOW_EMPTY = "1" +PACKAGES = "${PN}-demos" QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" -#QTDEMOS_disabled = "fotowall" -RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}" +RDEPENDS_${PN}-demos = "${QTDEMOS}" diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb index 4b6d6a70c1..2ee7959c0c 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb @@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 inherit packagegroup -TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' +PACKAGES = "${PN}-base" -PACKAGES += " \ - ${PN}-base \ -" +TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' RDEPENDS_${PN}-base = " \ qt4-embedded \ diff --git a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb index abd6a1fcbe..61466d910b 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb @@ -1,12 +1,15 @@ DESCRIPTION = "Target packages for Qt Embedded SDK" LICENSE = "MIT" -ALLOW_EMPTY = "1" PR = "r5" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + RDEPENDS_${PN} += " \ packagegroup-core-standalone-sdk-target \ qt4-embedded-mkspecs \ diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb index 4f3bb47000..432d99d0ca 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb @@ -8,18 +8,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r1" -PACKAGES = "\ - packagegroup-core-x11-mini \ - packagegroup-core-x11-mini-dbg \ - packagegroup-core-x11-mini-dev \ - " +inherit packagegroup PACKAGE_ARCH = "${MACHINE_ARCH}" XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" -ALLOW_EMPTY = "1" - ROOTLESS_X = "1" # xserver-common, x11-common diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 380584e223..f38e0d2800 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -8,16 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r32" -PACKAGES = "\ - packagegroup-core-x11-sato \ - packagegroup-core-x11-sato-dbg \ - packagegroup-core-x11-sato-dev \ - " +inherit packagegroup PACKAGE_ARCH = "${MACHINE_ARCH}" -ALLOW_EMPTY = "1" - NETWORK_MANAGER ?= "connman-gnome" NETWORK_MANAGER_libc-uclibc = "" diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb index 4c16c461a3..3fe5caee93 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb @@ -8,24 +8,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r36" +inherit packagegroup + PACKAGES = "\ packagegroup-core-apps-x11-core \ - packagegroup-core-apps-x11-core-dbg \ - packagegroup-core-apps-x11-core-dev \ packagegroup-core-apps-x11-games \ - packagegroup-core-apps-x11-games-dbg \ - packagegroup-core-apps-x11-games-dev \ packagegroup-core-x11-base \ - packagegroup-core-x11-base-dbg \ - packagegroup-core-x11-base-dev \ " PACKAGE_ARCH = "${MACHINE_ARCH}" XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" -ALLOW_EMPTY = "1" - # pcmanfm doesn't work on mips/powerpc FILEMANAGER ?= "pcmanfm" FILEMANAGER_mips ?= "" |