diff options
author | Jia Zhang <lans.zhang2008@gmail.com> | 2017-09-02 11:11:00 +0800 |
---|---|---|
committer | Jia Zhang <lans.zhang2008@gmail.com> | 2017-09-02 11:11:44 +0800 |
commit | b69537380c9c30502831d333055f003759e44fbd (patch) | |
tree | a65ba3d6069d8b6c4b99277e0bb1394f36c55983 | |
parent | 7f72300c2359539d029aca45eadd7ecdc04b7a1c (diff) | |
download | meta-secure-core-b69537380c9c30502831d333055f003759e44fbd.tar.gz |
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 <lans.zhang2008@gmail.com>
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 @@ | |||
1 | DESCRIPTION = "EFI Secure Boot packages for secure-environment." | 1 | DESCRIPTION = "EFI Secure Boot packages for secure-environment." |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "\ | 3 | LIC_FILES_CHKSUM = "\ |
4 | file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | 4 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | ||
6 | " | 5 | " |
7 | 6 | ||
8 | S = "${WORKDIR}" | 7 | 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 @@ | |||
1 | LICENSE = "MIT" | 1 | LICENSE = "MIT" |
2 | LIC_FILES_CHKSUM = "\ | 2 | LIC_FILES_CHKSUM = "\ |
3 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | 3 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
4 | " | 4 | " |
5 | 5 | ||
6 | ALLOW_EMPTY_${PN} = "1" | 6 | 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 @@ | |||
1 | DESCRIPTION = "Packagegroup for Intrusion Detection System (IDS) utilities." | 1 | DESCRIPTION = "Packagegroup for Intrusion Detection System (IDS) utilities." |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "\ | 3 | LIC_FILES_CHKSUM = "\ |
4 | file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | 4 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | ||
6 | " | 5 | " |
7 | 6 | ||
8 | inherit packagegroup | 7 | 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 @@ | |||
1 | LICENSE = "MIT" | 1 | LICENSE = "MIT" |
2 | LIC_FILES_CHKSUM = "\ | 2 | LIC_FILES_CHKSUM = "\ |
3 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | 3 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
4 | " | 4 | " |
5 | 5 | ||
6 | S = "${WORKDIR}" | 6 | 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 @@ | |||
1 | DESCRIPTION = "The initrd script for Linux Integrity Measurement Architecture (IMA)" | 1 | DESCRIPTION = "The initrd script for Linux Integrity Measurement Architecture (IMA)" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "\ | 3 | LIC_FILES_CHKSUM = "\ |
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | 4 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
5 | " | 5 | " |
6 | 6 | ||
7 | SRC_URI = "\ | 7 | 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 @@ | |||
1 | DESCRIPTION = "The default external IMA policy" | 1 | DESCRIPTION = "The default external IMA policy" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "\ | 3 | LIC_FILES_CHKSUM = "\ |
4 | file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | 4 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | ||
6 | " | 5 | " |
7 | 6 | ||
8 | SRC_URI = "\ | 7 | 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 @@ | |||
1 | DESCRIPTION = "Key store for key installation" | 1 | DESCRIPTION = "Key store for key installation" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "\ | 3 | LIC_FILES_CHKSUM = "\ |
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | 4 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
5 | " | 5 | " |
6 | 6 | ||
7 | S = "${WORKDIR}" | 7 | 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 @@ | |||
1 | DESCRIPTION = "Basic packagegroup for TCG TSS and utilities that use it." | 1 | DESCRIPTION = "Basic packagegroup for TCG TSS and utilities that use it." |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "\ | 3 | LIC_FILES_CHKSUM = "\ |
4 | file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | 4 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | ||
6 | " | 5 | " |
7 | 6 | ||
8 | inherit packagegroup | 7 | 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 @@ | |||
1 | DESCRIPTION = "Packagegroup for TPM2 TCG TSS userspace and utilities." | 1 | DESCRIPTION = "Packagegroup for TPM2 TCG TSS userspace and utilities." |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "\ | 3 | LIC_FILES_CHKSUM = "\ |
4 | file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | 4 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | ||
6 | " | 5 | " |
7 | 6 | ||
8 | inherit packagegroup | 7 | 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 @@ | |||
1 | SUMMARY = "Basic init for initramfs to mount and pivot root" | 1 | SUMMARY = "Basic init for initramfs to mount and pivot root" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "\ | 3 | LIC_FILES_CHKSUM = "\ |
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | 4 | file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ |
5 | " | 5 | " |
6 | 6 | ||
7 | SRC_URI = "\ | 7 | SRC_URI = "\ |