From 1cb40bd3c212041ec4d26b88a38ad53d7e496768 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 7 Feb 2021 12:32:29 +0100 Subject: [PATCH 1/2] Revert "rust-llvm: Use early variable assignment for the license checksum in rust-llvm.inc" This reverts commit 5dda6c427a7cca264870f6b7fc64753203e7d30d. This breaks rust-llvm builds with: ERROR: QA Issue: rust-llvm-native: LIC_FILES_CHKSUM points to an invalid file: TOPDIR/BUILD/work/x86_64-linux/rust-llvm-native/1.47.0-r0/rustc-1.47.0-src/src/llvm-project/llvm/COPYRIGHT [license-checksum] Signed-off-by: Martin Jansa --- recipes-devtools/rust/rust-llvm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc index fb6c13e..53ae87e 100644 --- a/recipes-devtools/rust/rust-llvm.inc +++ b/recipes-devtools/rust/rust-llvm.inc @@ -5,7 +5,7 @@ SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch" S = "${RUSTSRC}/src/llvm-project/llvm" -LIC_FILES_CHKSUM ?= "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe" inherit cmake python3native From 80c30c301796051f6bfc50d97398678cdf135208 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 7 Feb 2021 19:00:03 +0100 Subject: [PATCH 2/2] rust-llvm-ncsa.inc: reorder to actually set LICENSE and LIC_FILES_CHKSUM * rust-llvm.inc sets LICENSE and corresponding LIC_FILES_CHKSUM for Apache-2.0-with-LLVM-exception, but the recipes which include rust-llvm-ncsa.inc need to change it to NCSA. Signed-off-by: Martin Jansa --- recipes-devtools/rust/rust-llvm-ncsa.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes-devtools/rust/rust-llvm-ncsa.inc b/recipes-devtools/rust/rust-llvm-ncsa.inc index 903f283..680b9d0 100644 --- a/recipes-devtools/rust/rust-llvm-ncsa.inc +++ b/recipes-devtools/rust/rust-llvm-ncsa.inc @@ -1,5 +1,4 @@ -LICENSE = "NCSA" - -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648" - require rust-llvm.inc + +LICENSE = "NCSA" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"