Cleanup meta and packagegroup recipes

Better inlined with upstream code, no actual functionality changes.

Change-Id: I3f4e3170c925e498cfbd86c93d9265fa0bb8436f
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

3 files changed, 11 insertions, 10 deletions

diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
index 0540596..0c0214f 100644
--- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
+++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
@@ -24,7 +24,9 @@ DESCRIPTION = "B2Qt on embedded Linux SDK toolchain"
 PR = "r0"
 LICENSE = "CLOSED"
 
-TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}"
-TOOLCHAIN_TARGET_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-target"
+inherit populate_sdk
+
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-toolchain-host"
+TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-toolchain-target"
+
 
-require recipes-core/meta/meta-toolchain.bb
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index d5b41f7..d767fcc 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -22,15 +22,15 @@
 
 DESCRIPTION = "Host packages for B2Qt on embedded Linux SDK"
 PR = "r0"
-ALLOW_EMPTY_${PN} = "1"
 LICENSE = "CLOSED"
 
-require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+inherit nativesdk packagegroup
 
 RDEPENDS_${PN} = "\
-    python-nativesdk \
-    python-modules-nativesdk \
-    python-misc-nativesdk \
+    nativesdk-packagegroup-sdk-host \
+    nativesdk-python-modules \
+    nativesdk-python-misc \
+    nativesdk-perl-modules \
     nativesdk-bison \
     nativesdk-gperf \
     ${MACHINE_EXTRA_INSTALL_SDK_HOST} \
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index 5424f0d..ba56a5c 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -22,10 +22,9 @@
 
 DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK"
 PR = "r0"
-ALLOW_EMPTY_${PN} = "1"
 LICENSE = "CLOSED"
 
-PACKAGES = "${PN}"
+inherit packagegroup
 
 MACHINE_EXTRA_INSTALL_SDK ?= ""