Skip to content

Commit c90c9b0

Browse files
codypscodyps
authored
Merge pull request meta-rust#299 from shr-project/jansa/lic
Further simplify LIC_FILES_CHKSUM
2 parents 433b721 + 3e73030 commit c90c9b0

31 files changed

+39
-149
lines changed

‎conf/distro/include/rust_versions.inc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# include this in your distribution to easily switch between versions
2+
# just by changing RUST_VERSION variable
3+
4+
RUST_VERSION ?= "1.47.0"
5+
6+
PREFERRED_VERSION_cargo ?= "${RUST_VERSION}"
7+
PREFERRED_VERSION_cargo-native ?= "${RUST_VERSION}"
8+
PREFERRED_VERSION_libstd-rs ?= "${RUST_VERSION}"
9+
PREFERRED_VERSION_rust ?= "${RUST_VERSION}"
10+
PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUST_VERSION}"
11+
PREFERRED_VERSION_rust-llvm ?= "${RUST_VERSION}"
12+
PREFERRED_VERSION_rust-llvm-native ?= "${RUST_VERSION}"
13+
PREFERRED_VERSION_rust-native ?= "${RUST_VERSION}"

‎recipes-devtools/cargo/cargo.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ DEPENDS = "openssl zlib curl ca-certificates libssh2"
77

88
LIC_FILES_CHKSUM = " \
99
file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
10+
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
11+
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
1012
"
1113

1214
SRC_URI += "file://0001-Disable-http2.patch"

‎recipes-devtools/cargo/cargo_1.34.2.bb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
44

5-
LIC_FILES_CHKSUM += " \
5+
# This version has different LICENSE-APACHE and LICENSE-THIRD-PARTY
6+
7+
LIC_FILES_CHKSUM = " \
8+
file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
69
file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
710
file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
811
"

‎recipes-devtools/cargo/cargo_1.36.0.bb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
4-
5-
LIC_FILES_CHKSUM += " \
6-
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
7-
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
8-
"

‎recipes-devtools/cargo/cargo_1.37.0.bb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
4-
5-
LIC_FILES_CHKSUM += " \
6-
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
7-
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
8-
"

‎recipes-devtools/cargo/cargo_1.39.0.bb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
4-
5-
LIC_FILES_CHKSUM += " \
6-
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
7-
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
8-
"

‎recipes-devtools/cargo/cargo_1.40.0.bb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
4-
5-
LIC_FILES_CHKSUM += " \
6-
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
7-
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
8-
"

‎recipes-devtools/cargo/cargo_1.41.0.bb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
4-
5-
LIC_FILES_CHKSUM += " \
6-
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
7-
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
8-
"

‎recipes-devtools/cargo/cargo_1.43.0.bb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
4-
5-
LIC_FILES_CHKSUM += " \
6-
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
7-
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
8-
"

‎recipes-devtools/cargo/cargo_1.46.0.bb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
4-
5-
LIC_FILES_CHKSUM += " \
6-
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
7-
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
8-
"

‎recipes-devtools/cargo/cargo_1.47.0.bb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
require recipes-devtools/rust/rust-source-${PV}.inc
22
require recipes-devtools/rust/rust-snapshot-${PV}.inc
33
require cargo.inc
4-
5-
LIC_FILES_CHKSUM += " \
6-
file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
7-
file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
8-
"

‎recipes-devtools/rust/rust-source-1.34.2.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SRC_URI[rust.sha256sum] = "c69a4a85a1c464368597df8878cb9e1121aae93e215616d45ad7d
77
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
88
# set this as our default
99
S = "${RUSTSRC}"
10-
11-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-source-1.36.0.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SRC_URI[rust.sha256sum] = "f51645b9f787af4a5d94db17f6af39db0c55980ed24fe366cad55
77
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
88
# set this as our default
99
S = "${RUSTSRC}"
10-
11-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-source-1.37.0.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SRC_URI[rust.sha256sum] = "10abffac50a729cf74cef6dd03193a2f4647541bd19ee9281be9e
77
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
88
# set this as our default
99
S = "${RUSTSRC}"
10-
11-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-source-1.39.0.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SRC_URI[rust.sha256sum] = "4b0dbb356070687a606034f71dc032b783bbf8b5d3f9fff39f2c1
77
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
88
# set this as our default
99
S = "${RUSTSRC}"
10-
11-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-source-1.40.0.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SRC_URI[rust.sha256sum] = "6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a528
77
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
88
# set this as our default
99
S = "${RUSTSRC}"
10-
11-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-source-1.41.0.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SRC_URI[rust.sha256sum] = "38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6e
77
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
88
# set this as our default
99
S = "${RUSTSRC}"
10-
11-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-source-1.43.0.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ SRC_URI[rust.sha256sum] = "d0899933840369f07394b211cb0b53a5cd4634907633f0bee5411
66
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
77
# set this as our default
88
S = "${RUSTSRC}"
9-
10-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-source-1.46.0.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SRC_URI[rust.sha256sum] = "865dae1290a205f16ded8818c6a0254cc32862985fc250a602a70
77
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
88
# set this as our default
99
S = "${RUSTSRC}"
10-
11-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-source-1.47.0.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ SRC_URI[rust.sha256sum] = "ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6
66
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
77
# set this as our default
88
S = "${RUSTSRC}"
9-
10-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

‎recipes-devtools/rust/rust-target.inc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
require rust.inc
2+
3+
DEPENDS += "rust-llvm (=${PV})"
4+
5+
# Otherwise we'll depend on what we provide
6+
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
7+
# We don't need to depend on gcc-native because yocto assumes it exists
8+
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
9+
10+
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ SUMMARY = "Rust compiler and runtime libaries"
22
HOMEPAGE = "http://www.rust-lang.org"
33
SECTION = "devel"
44
LICENSE = "MIT | Apache-2.0"
5+
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
56

67
inherit rust
78
inherit cargo_common

‎recipes-devtools/rust/rust_1.34.2.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
4-
5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
12-
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust_1.36.0.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
4-
5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
12-
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust_1.37.0.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
4-
5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
12-
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust_1.39.0.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
4-
5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
12-
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust_1.40.0.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
4-
5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
12-
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust_1.41.0.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
4-
5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
12-
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust_1.43.0.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
4-
5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
12-
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust_1.46.0.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
4-
5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
12-
BBCLASSEXTEND = "native"

‎recipes-devtools/rust/rust_1.47.0.bb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
require rust.inc
1+
require rust-target.inc
22
require rust-source-${PV}.inc
33
require rust-snapshot-${PV}.inc
44

5-
DEPENDS += "rust-llvm (=${PV})"
6-
7-
# Otherwise we'll depend on what we provide
8-
INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
9-
# We don't need to depend on gcc-native because yocto assumes it exists
10-
PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
11-
125
# The default behaviour of x.py changed in 1.47+ so now we need to
136
# explicitly ask for the stage 2 compiler to be assembled.
147
do_compile () {
158
rust_runx build --stage 2 src/rustc
169
}
17-
18-
BBCLASSEXTEND = "native"

0 commit comments

Comments
 (0)