From 6afa457eefbb5578f7ca0388580c1f0cf32f9194 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 5 Sep 2012 09:57:45 +0100 Subject: packagegroup-*: fix/tidy up for inherit of packagegroup.bbclass * Move PACKAGE_ARCH setting after the inherit (or it won't work) * We don't need to set LIC_FILES_CHKSUM anymore Signed-off-by: Paul Eggleton --- recipes-opie/packagegroups/packagegroup-opie-16mb.bb | 5 ++--- recipes-opie/packagegroups/packagegroup-opie-all.bb | 2 -- recipes-opie/packagegroups/packagegroup-opie-apps.bb | 2 -- recipes-opie/packagegroups/packagegroup-opie-games.bb | 2 -- recipes-opie/packagegroups/packagegroup-opie.bb | 5 ++--- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/recipes-opie/packagegroups/packagegroup-opie-16mb.bb b/recipes-opie/packagegroups/packagegroup-opie-16mb.bb index 2855766..a6f2855 100644 --- a/recipes-opie/packagegroups/packagegroup-opie-16mb.bb +++ b/recipes-opie/packagegroups/packagegroup-opie-16mb.bb @@ -1,12 +1,11 @@ DESCRIPTION = "Tasks for small OPIE image" SECTION = "opie/base" LICENSE = "MIT" -PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r6" +PR = "r7" inherit packagegroup -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES = "packagegroup-opie-16mb-base \ packagegroup-opie-16mb-applets \ diff --git a/recipes-opie/packagegroups/packagegroup-opie-all.bb b/recipes-opie/packagegroups/packagegroup-opie-all.bb index 144642d..948585a 100644 --- a/recipes-opie/packagegroups/packagegroup-opie-all.bb +++ b/recipes-opie/packagegroups/packagegroup-opie-all.bb @@ -5,8 +5,6 @@ PR = "r4" inherit packagegroup -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - PACKAGES = "packagegroup-opie-applets packagegroup-opie-inputmethods packagegroup-opie-styles \ packagegroup-opie-decorations packagegroup-opie-multimedia packagegroup-opie-wlan \ packagegroup-opie-settings packagegroup-opie-pim packagegroup-opie-datebookplugins \ diff --git a/recipes-opie/packagegroups/packagegroup-opie-apps.bb b/recipes-opie/packagegroups/packagegroup-opie-apps.bb index d2825fb..3b102fb 100644 --- a/recipes-opie/packagegroups/packagegroup-opie-apps.bb +++ b/recipes-opie/packagegroups/packagegroup-opie-apps.bb @@ -6,8 +6,6 @@ PR = "r2" inherit packagegroup -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - PACKAGES = "packagegroup-opie-apps packagegroup-opie-extra-apps" RDEPENDS_packagegroup-opie-apps = "opie-advancedfm opie-bartender opie-calculator \ diff --git a/recipes-opie/packagegroups/packagegroup-opie-games.bb b/recipes-opie/packagegroups/packagegroup-opie-games.bb index cfb4083..fe488aa 100644 --- a/recipes-opie/packagegroups/packagegroup-opie-games.bb +++ b/recipes-opie/packagegroups/packagegroup-opie-games.bb @@ -5,8 +5,6 @@ PR = "r2" inherit packagegroup -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - PACKAGES = "packagegroup-opie-games packagegroup-opie-extra-games" RDEPENDS_packagegroup-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \ diff --git a/recipes-opie/packagegroups/packagegroup-opie.bb b/recipes-opie/packagegroups/packagegroup-opie.bb index ca21fa5..16dc212 100644 --- a/recipes-opie/packagegroups/packagegroup-opie.bb +++ b/recipes-opie/packagegroups/packagegroup-opie.bb @@ -1,13 +1,12 @@ DESCRIPTION = "Tasks for OPIE stuff" SECTION = "opie/base" LICENSE = "MIT" -PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r17" +PR = "r18" inherit packagegroup -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +PACKAGE_ARCH = "${MACHINE_ARCH}" PROVIDES = "packagegroup-opie-everything" -- cgit 1.2.3-korg