packagegroup-*: change to inherit from packagegroup.bbclass

Also clean out items already handled by that class (dev/dbg packages, ALLOW_EMPTY, etc.) (From OE-Core rev: 65fca4458cfe1d647c7ea1d4588dc449739a73eb) 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>
2026-01-29 21:08:42 +01:00 · 2012-07-26 18:16:14 +01:00
parent 073a12c9cb
commit 9bb6f42763
27 changed files with 52 additions and 168 deletions
--- 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 \
--- 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
 #
--- 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}"
--- 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 = "\
--- 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 \
    "
--- 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 \
--- 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"
--- 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"
--- 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 \
--- 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"

--- 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 \
--- 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 ?= ""
--- 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} \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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"
--- 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}"
--- 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 \
--- 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 \
--- 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
--- 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 = ""

--- 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 ?= ""