From b69537380c9c30502831d333055f003759e44fbd Mon Sep 17 00:00:00 2001 From: Jia Zhang Date: Sat, 2 Sep 2017 11:11:00 +0800 Subject: meta-secure-core: clean up ${COREBASE}/LICENSE and ${COREBASE}/meta/COPYING.MIT ${COREBASE}/LICENSE is not a valid license file. So it is recommended to use '${COMMON_LICENSE_DIR}/MIT' for a MIT License file in LIC_FILES_CHKSUM. This will become an error in the future. Signed-off-by: Jia Zhang --- .../recipes-base/packagegroups/packagegroup-efi-secure-boot.bb | 3 +-- .../recipes-base/packagegroups/packagegroup-luks.inc | 2 +- meta-ids/recipes-base/packagegroups/packagegroup-ids.bb | 3 +-- meta-integrity/recipes-base/packagegroups/packagegroup-ima.inc | 2 +- meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb | 2 +- meta-integrity/recipes-support/ima-policy/ima-policy_0.1.bb | 3 +-- meta-signing-key/recipes-support/key-store/key-store_0.1.bb | 2 +- meta-tpm/recipes-base/packagegroups/packagegroup-tpm.bb | 3 +-- meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc | 3 +-- meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb | 2 +- 10 files changed, 10 insertions(+), 15 deletions(-) diff --git a/meta-efi-secure-boot/recipes-base/packagegroups/packagegroup-efi-secure-boot.bb b/meta-efi-secure-boot/recipes-base/packagegroups/packagegroup-efi-secure-boot.bb index 1709549..1dee84e 100644 --- a/meta-efi-secure-boot/recipes-base/packagegroups/packagegroup-efi-secure-boot.bb +++ b/meta-efi-secure-boot/recipes-base/packagegroups/packagegroup-efi-secure-boot.bb @@ -1,8 +1,7 @@ DESCRIPTION = "EFI Secure Boot packages for secure-environment." LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " S = "${WORKDIR}" diff --git a/meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks.inc b/meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks.inc index b3fa991..2e586d4 100644 --- a/meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks.inc +++ b/meta-encrypted-storage/recipes-base/packagegroups/packagegroup-luks.inc @@ -1,6 +1,6 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " ALLOW_EMPTY_${PN} = "1" diff --git a/meta-ids/recipes-base/packagegroups/packagegroup-ids.bb b/meta-ids/recipes-base/packagegroups/packagegroup-ids.bb index 8c8503d..89623c3 100644 --- a/meta-ids/recipes-base/packagegroups/packagegroup-ids.bb +++ b/meta-ids/recipes-base/packagegroups/packagegroup-ids.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Packagegroup for Intrusion Detection System (IDS) utilities." LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " inherit packagegroup diff --git a/meta-integrity/recipes-base/packagegroups/packagegroup-ima.inc b/meta-integrity/recipes-base/packagegroups/packagegroup-ima.inc index e39875b..b84cf68 100644 --- a/meta-integrity/recipes-base/packagegroups/packagegroup-ima.inc +++ b/meta-integrity/recipes-base/packagegroups/packagegroup-ima.inc @@ -1,6 +1,6 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " S = "${WORKDIR}" diff --git a/meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb b/meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb index 737d8b7..e615e05 100644 --- a/meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb +++ b/meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The initrd script for Linux Integrity Measurement Architecture (IMA)" LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " SRC_URI = "\ diff --git a/meta-integrity/recipes-support/ima-policy/ima-policy_0.1.bb b/meta-integrity/recipes-support/ima-policy/ima-policy_0.1.bb index 9175839..cfab5be 100644 --- a/meta-integrity/recipes-support/ima-policy/ima-policy_0.1.bb +++ b/meta-integrity/recipes-support/ima-policy/ima-policy_0.1.bb @@ -1,8 +1,7 @@ DESCRIPTION = "The default external IMA policy" LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " SRC_URI = "\ diff --git a/meta-signing-key/recipes-support/key-store/key-store_0.1.bb b/meta-signing-key/recipes-support/key-store/key-store_0.1.bb index 401646f..86a0f45 100644 --- a/meta-signing-key/recipes-support/key-store/key-store_0.1.bb +++ b/meta-signing-key/recipes-support/key-store/key-store_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Key store for key installation" LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " S = "${WORKDIR}" diff --git a/meta-tpm/recipes-base/packagegroups/packagegroup-tpm.bb b/meta-tpm/recipes-base/packagegroups/packagegroup-tpm.bb index 460320b..4a06767 100644 --- a/meta-tpm/recipes-base/packagegroups/packagegroup-tpm.bb +++ b/meta-tpm/recipes-base/packagegroups/packagegroup-tpm.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Basic packagegroup for TCG TSS and utilities that use it." LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " inherit packagegroup diff --git a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc index d19db9e..d148f94 100644 --- a/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc +++ b/meta-tpm2/recipes-base/packagegroups/packagegroup-tpm2.inc @@ -1,8 +1,7 @@ DESCRIPTION = "Packagegroup for TPM2 TCG TSS userspace and utilities." LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " inherit packagegroup diff --git a/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb b/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb index 2b1ca44..8b912ad 100644 --- a/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb +++ b/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb @@ -1,7 +1,7 @@ SUMMARY = "Basic init for initramfs to mount and pivot root" LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ + file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ " SRC_URI = "\ -- cgit v1.2.3-54-g00ecf