aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/packagegroups
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-26 18:16:14 +0100
committerSaul Wold <sgw@linux.intel.com>2012-09-03 22:52:50 -0700
commit65fca4458cfe1d647c7ea1d4588dc449739a73eb (patch)
tree66ab6e610c025dbf9fcd5480324c043e06125182 /meta/recipes-core/packagegroups
parent3a3ae22bc0be5b36e0400986930f30c22a61a74e (diff)
downloadopenembedded-core-contrib-65fca4458cfe1d647c7ea1d4588dc449739a73eb.tar.gz
openembedded-core-contrib-65fca4458cfe1d647c7ea1d4588dc449739a73eb.tar.bz2
openembedded-core-contrib-65fca4458cfe1d647c7ea1d4588dc449739a73eb.zip
packagegroup-*: change to inherit from packagegroup.bbclass
Also clean out items already handled by that class (dev/dbg packages, ALLOW_EMPTY, etc.) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/packagegroups')
-rw-r--r--meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb5
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-base.bb2
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb16
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-console.bb8
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-nfs.bb10
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-sdk.bb8
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb12
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb12
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb3
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb8
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb8
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb8
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb6
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb4
14 files changed, 27 insertions, 83 deletions
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index ea054bc9c95..ef05004e300 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 85acd1fe724..7e2bd69f305 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 7e80fffe4ae..b49fb3f2918 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 fd8eb252db8..63003d0b957 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 4b1059c9f2d..8b2318ea66e 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 663f7057de5..4ee802f9d91 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 9dcc342dc46..a07e2badf98 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 7e85b29ad8a..89f8c93ec78 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 03628a167db..d9120185811 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 b7eff216223..be424a30ee9 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 30776ef658b..24a99c7eb9e 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 bdd0d058f98..52c278a53cb 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 6ab4a95846f..8870ccc8c8a 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 118ff7d48b4..7567457d2ee 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 \