From 07d2b9d95a4064da8f7255e7bf5f6e9e815c9823 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 13:04:22 -0400 Subject: meta-quanta: Remove references to QUANTABASE QUANTABASE is only used for pointing at licenses...point at the licenses in oe-core in meta/files/common-licenses instead. to match the defacto convention used in other oe layers like meta-openembedded. (From meta-quanta rev: 170929b6044497d12e65a6a2c5e7025262c9d783) Change-Id: I12defd008e095db3227e5cd39261f942abd1406c Signed-off-by: Brad Bishop --- meta-quanta/conf/layer.conf | 3 --- .../recipes-phosphor/ipmi/f0b-ipmi-fru-read-inventory-native.bb | 2 +- .../meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-inventory-map-native.bb | 2 +- meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb | 2 +- meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb | 2 +- .../recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb | 2 +- meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb | 2 +- .../recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb | 2 +- .../meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb | 2 +- .../meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb | 2 +- .../meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb | 2 +- .../recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb | 2 +- .../meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb | 2 +- .../meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb | 2 +- .../meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb | 2 +- 15 files changed, 14 insertions(+), 17 deletions(-) diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf index 6bc649299..ca07679d6 100644 --- a/meta-quanta/conf/layer.conf +++ b/meta-quanta/conf/layer.conf @@ -8,6 +8,3 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "quanta-layer" BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_quanta-layer = "thud warrior" - -# Provide a variable that points the base of the quanta layer. -QUANTABASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-fru-read-inventory-native.bb b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-fru-read-inventory-native.bb index 89d861033..ac198a177 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-fru-read-inventory-native.bb +++ b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-fru-read-inventory-native.bb @@ -1,7 +1,7 @@ SUMMARY = "F0B inventory map for phosphor-ipmi-host" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-host diff --git a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-inventory-map-native.bb b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-inventory-map-native.bb index 1831e59a9..edd8364c0 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-inventory-map-native.bb +++ b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/f0b-ipmi-inventory-map-native.bb @@ -1,7 +1,7 @@ SUMMARY = "F0B IPMI to DBus Inventory mapping." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-fru diff --git a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb index 86303c359..24ca38d8f 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb @@ -2,7 +2,7 @@ SUMMARY = "OpenBMC Quanta Detect Fan Fail Service" DESCRIPTION = "OpenBMC Quanta Detect Fan Fail Daemon." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit systemd diff --git a/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb b/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb index 8d3fbf376..37e4e44cf 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb @@ -2,7 +2,7 @@ SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git" SRCREV = "${AUTOREV}" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit autotools pkgconfig inherit systemd diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb index ada2a6a36..887b50305 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb @@ -2,7 +2,7 @@ SUMMARY = "Phosphor OpenBMC Quanta NVME Power Control Service" DESCRIPTION = "Phosphor OpenBMC Quanta NVME Power Control Daemon." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" FILESEXTRAPATHS_append := "${THISDIR}/files:" diff --git a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb index 591ca5afd..ad46c0b32 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb @@ -1,6 +1,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/files:" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS += "systemd" RDEPENDS_${PN} += "libsystemd" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb index 340955c1a..c6061a23e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb @@ -1,7 +1,7 @@ SUMMARY = "gsj inventory map for phosphor-ipmi-host" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-host diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb index db3aaf20e..d46a7abdd 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb @@ -1,7 +1,7 @@ SUMMARY = "gsj IPMI to DBus Inventory mapping." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-fru diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb index b716bf054..2389730e8 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Quanta gsj IPMI to DBus Sensor mapping." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-host diff --git a/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb index c8a8291e1..a91420fe9 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb +++ b/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Phosphor LED Group Management for gsj" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb index 83bf5c2b2..f6db0c914 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb @@ -1,5 +1,5 @@ LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb index dbb59178f..85c085e99 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Quanta-Q71l IPMI to DBus Inventory mapping." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-fru diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb index 07c53e416..0c595fa71 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Quanta Q71l IPMI to DBus Sensor mapping." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-host diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb index f6f6458bf..37b27ac69 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb +++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb @@ -1,6 +1,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/files:" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit systemd inherit obmc-phosphor-systemd -- cgit v1.2.3