From 187ee9bdcdb594018c919064234af122d66ff7be Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 16 Feb 2017 17:56:38 +0100 Subject: [PATCH] morty migration: packagegroups: remove explicit LICENSE variable The LICENSE is added through the packagegroup bbclass and the checksums were outdated making the build fail with: The LIC_FILES_CHKSUM does not match for poky/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 https://jira.digi.com/browse/DEL-3451 Signed-off-by: Javier Viguera --- .../packagegroups/packagegroup-dey-bluetooth.bb | 7 ++----- .../packagegroups/packagegroup-dey-network.bb | 4 +--- .../packagegroups/packagegroup-dey-wireless.bb | 4 +--- .../recipes-core/packagegroups/packagegroup-dey-core.bb | 5 ++--- .../recipes-core/packagegroups/packagegroup-dey-debug.bb | 4 +--- .../packagegroups/packagegroup-dey-examples.bb | 3 --- .../packagegroups/packagegroup-dey-trustfence.bb | 3 --- .../recipes-graphics/packagegroups/packagegroup-dey-qt.bb | 3 --- .../packagegroups/packagegroup-dey-audio.bb | 4 +--- .../packagegroups/packagegroup-dey-gstreamer.bb | 2 -- 10 files changed, 8 insertions(+), 31 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb index 0caf33a3a..e07386caf 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb @@ -2,12 +2,9 @@ # Copyright (C) 2012 Digi International. # SUMMARY = "Bluetooth packagegroup for DEY image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit bluetooth -inherit packagegroup +PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup bluetooth RDEPENDS_${PN} = " \ ${BLUEZ} \ diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb index ce7d5d7ef..1f3abb010 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb @@ -2,10 +2,8 @@ # Copyright (C) 2012 Digi International. # SUMMARY = "Network applications packagegroup for DEY image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup # Distro can override the following VIRTUAL-RUNTIME providers: diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index 0ddf4d9b6..e4f27eb3e 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -2,10 +2,8 @@ # Copyright (C) 2012 Digi International. # SUMMARY = "Wireless packagegroup for DEY image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup RDEPENDS_${PN} = "\ diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index d8201c7dd..34a0425bf 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -2,11 +2,10 @@ # Copyright (C) 2012 Digi International. # SUMMARY = "Core packagegroup for DEY image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PACKAGE_ARCH = "${MACHINE_ARCH}" + DEPENDS = "virtual/kernel" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup # diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb index 11dd269ad..2f47f8bc1 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb @@ -2,10 +2,8 @@ # Copyright (C) 2012 Digi International. # SUMMARY = "Debug applications packagegroup for DEY image" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup RDEPENDS_${PN} = "\ diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb index 5df5449fb..e854834b6 100644 --- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb +++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb @@ -1,9 +1,6 @@ # Copyright (C) 2013 Digi International. SUMMARY = "DEY examples packagegroup" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb index ff85f755e..8ab2b03f6 100644 --- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb +++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-trustfence.bb @@ -1,9 +1,6 @@ # Copyright (C) 2016 Digi International. SUMMARY = "DEY trustfence packagegroup" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" inherit packagegroup diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb index b4197ab64..9c6c8e979 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb @@ -2,11 +2,8 @@ # Copyright (C) 2013 Digi International. # SUMMARY = "QT packagegroup for DEY image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" PACKAGE_ARCH = "${MACHINE_ARCH}" - inherit packagegroup MACHINE_QT5_EXTRA_INSTALL ?= "" diff --git a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb index 3d29fdea6..1f5ece5d1 100644 --- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb +++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb @@ -2,10 +2,8 @@ # Copyright (C) 2012 Digi International. # SUMMARY = "Audio packagegroup for DEY image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup ALSA_UTILS_PKGS = " \ diff --git a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb index b8bd34829..15abe22f9 100644 --- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb +++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb @@ -2,8 +2,6 @@ # Copyright (C) 2012 Digi International. # SUMMARY = "Gstreamer framework packagegroup for DEY image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup