From 1ebdb618dd22b82c7c7aa3cee8ce9765024a2a20 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 12:18:25 -0400 Subject: meta-openpower: Remove references to OPENPOWERBASE OPENPOWERBASE 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-openpower rev: 2e899dc36982e5420f136da967669544e49c0c0e) Change-Id: Ia201bc5e60a9e4cd2392bb3735c99596d1fee006 Signed-off-by: Brad Bishop --- meta-openpower/conf/layer.conf | 3 --- meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb | 2 +- .../dbus/openpower-dbus-interfaces-mapper-config-native.bb | 2 +- meta-openpower/recipes-phosphor/fsi/op-fsi.bb | 2 +- meta-openpower/recipes-phosphor/host/checkstop-monitor.bb | 2 +- meta-openpower/recipes-phosphor/host/hostboot-settings.bb | 2 +- meta-openpower/recipes-phosphor/host/p9-cfam-override.bb | 2 +- meta-openpower/recipes-phosphor/host/p9-host-start.bb | 2 +- meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb | 2 +- .../recipes-phosphor/ipmi/hostboot-inventory-config-native.bb | 2 +- .../ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb | 2 +- .../recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb | 2 +- meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb | 2 +- meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb | 2 +- .../recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb | 2 +- .../recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb | 2 +- .../recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb | 2 +- .../recipes-phosphor/vpd/openpower-fru-properties-example-native.bb | 2 +- .../recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb | 2 +- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb | 2 +- 20 files changed, 19 insertions(+), 22 deletions(-) (limited to 'meta-openpower') diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf index 6bc20a421..2cb27d200 100644 --- a/meta-openpower/conf/layer.conf +++ b/meta-openpower/conf/layer.conf @@ -9,6 +9,3 @@ BBFILE_COLLECTIONS += "openpower-layer" BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/" LAYERVERSION_openpower-layer = "1" LAYERSERIES_COMPAT_openpower-layer = "thud warrior" - -# Provide a variable that points the base of the openpower layer. -OPENPOWERBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb b/meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb index 52ac769ab..39141bab8 100644 --- a/meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb +++ b/meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb @@ -1,7 +1,7 @@ SUMMARY = "Shared OpenPOWER configuration" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch diff --git a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb index 6f0771aa6..e0b296fb9 100644 --- a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb +++ b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb @@ -3,7 +3,7 @@ DESCRIPTION="Add the /org/open_power path namespace and \ org.open_power interface prefix to the mapper \ watch list." LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit phosphor-mapper inherit native diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index 7af9731f5..e056d6d28 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb @@ -2,7 +2,7 @@ SUMMARY = "FSI Services" DESCRIPTION = "Install FSI related services" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb index 452cdeb87..ebb3a2f77 100644 --- a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb +++ b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb @@ -1,7 +1,7 @@ SUMMARY = "OpenPOWER Host checkstop monitor application" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd inherit allarch diff --git a/meta-openpower/recipes-phosphor/host/hostboot-settings.bb b/meta-openpower/recipes-phosphor/host/hostboot-settings.bb index 0a713e766..772a51462 100644 --- a/meta-openpower/recipes-phosphor/host/hostboot-settings.bb +++ b/meta-openpower/recipes-phosphor/host/hostboot-settings.bb @@ -1,7 +1,7 @@ SUMMARY = "OpenPower Hostboot Boot settings tool" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd inherit allarch diff --git a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb index e395841ba..769a1348d 100644 --- a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb +++ b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb @@ -2,7 +2,7 @@ SUMMARY = "POWER9 CFAM override" DESCRIPTION = "Applies user CFAM register overrides from file" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb index b9110010e..374359838 100644 --- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb @@ -2,7 +2,7 @@ SUMMARY = "POWER9 start host" DESCRIPTION = "Service to start POWER9 IPL through SBE" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb index 43efeab24..29167b0e1 100644 --- a/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb +++ b/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb @@ -2,7 +2,7 @@ SUMMARY = "POWER9 VCS workaround" DESCRIPTION = "Apply fixes over FSI to POWER9 CPUs prior to host power on" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb index b60a9e38f..bd0a8eea4 100644 --- a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Hostboot hostfw inventory map for phosphor-ipmi-fru" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/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-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb index b9fd60552..6e2c1fc5d 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb @@ -1,7 +1,7 @@ SUMMARY = "OEM sensor config for phosphor-host-ipmid" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/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-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb index 4ca070784..1c8758793 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Whitelisted OpenBMC IPMI OEM commands" DESCRIPTION = "Whitelisted OpenBMC IPMI OEM commands for OpenPOWER based systems" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/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-whitelist diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb index 7f71e7c01..f3f7d34cf 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Init BMC Hostname" DESCRIPTION = "Setup BMC Unique hostname" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch systemd diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb b/meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb index 1a1ee97dc..f67ddd464 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Init BMC MAC address" DESCRIPTION = "Setup BMC MAC address read from VPD" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch systemd diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb index 1b228adb3..796088546 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb @@ -1,7 +1,7 @@ SUMMARY = "OpenPower OCC Control with MRW generated sensor IDs" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-occ-control diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb index e04ebd908..3c9c8eae2 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Inventory config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb index 12e9f277e..be0779fef 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Inventory config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb index c398cc8f8..67107a6e8 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb @@ -1,7 +1,7 @@ SUMMARY = "FRU properties config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb index 0e32a4268..42b1f37e4 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb @@ -1,7 +1,7 @@ SUMMARY = "FRU properties config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb index e0717e36d..5b0188614 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb @@ -1,7 +1,7 @@ SUMMARY = "VPD layout for openpower-fru-vpd" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd -- cgit v1.2.3