Skip to content

Commit 177ebd6

Browse files
committed
Add YP kirkstone to LAYERSERIES_COMPAT supported layers.
[Yocto Kirkstone Migration SYSROOT_DIRS_BLACKLIST -> SYSROOT_DIRS_IGNORE](https://docs.yoctoproject.org/dev/migration-guides/migration-4.0.html) Signed-off-by: 8joshua88 <[email protected]>
1 parent 39dd0fc commit 177ebd6

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

conf/layer.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# We have a conf and classes directory, append to BBPATH
2-
BBPATH .= ":${LAYERDIR}"
2+
BBPATH =. "${LAYERDIR}:"
33

44
# We have a recipes directory, add to BBFILES
55
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
66

77
BBFILE_COLLECTIONS += "rust-bin-layer"
8-
BBFILE_PATTERN_rust-bin-layer := "^${LAYERDIR}/"
8+
BBFILE_PATTERN_rust-bin-layer = "^${LAYERDIR}/"
99
BBFILE_PRIORITY_rust-bin-layer = "7"
1010

1111
LICENSE_PATH += "${LAYERDIR}/files/common-licenses"
@@ -15,4 +15,5 @@ LAYERSERIES_COMPAT_rust-bin-layer = " \
1515
gatesgarth \
1616
hardknott \
1717
honister \
18+
kirkstone \
1819
"

recipes-devtools/rust/cargo-bin-cross.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PN = "cargo-bin-cross-${TARGET_ARCH}"
1111
CARGO_HOST_TARGET = "${@rust_target(d, 'HOST')}"
1212

1313
SYSROOT_DIRS_NATIVE += "${prefix}"
14-
SYSROOT_DIRS_BLACKLIST += "\
14+
SYSROOT_DIRS_IGNORE += "\
1515
${prefix}/share \
1616
${prefix}/etc \
1717
"

recipes-devtools/rust/rust-bin-cross.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ S = "${WORKDIR}/rustc-${PV}-${RUST_BUILD_TARGET}"
2626
S[vardepsexclude] += "WORKDIR"
2727

2828
SYSROOT_DIRS_NATIVE += "${prefix}"
29-
SYSROOT_DIRS_BLACKLIST += "\
29+
SYSROOT_DIRS_IGNORE += "\
3030
${prefix}/share \
3131
${prefix}/etc \
3232
"

0 commit comments

Comments
 (0)