Skip to content

Commit f349a36

Browse files
authored
Merge pull request #123 from 8joshua88/master
Add kirkstone to compatibility layer
2 parents cb9d932 + 9edbbcb commit f349a36

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

README.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,35 @@ An OpenEmebdded/Yocto layer providing pre-built toolchains for the
66

77
<!-- toc -->
88

9-
- [Basic Example](#basic-example)
10-
- [Features](#features)
11-
- [Advanced Features](#advanced-features)
12-
* [Specifying Cargo Features](#specifying-cargo-features)
13-
* [Using Components Individually](#using-components-individually)
14-
- [Pre-built vs. Compiled](#pre-built-vs-compiled)
15-
- [Copyright](#copyright)
9+
- [meta-rust-bin](#meta-rust-bin)
10+
- [Basic Example](#basic-example)
11+
- [Features](#features)
12+
- [Advanced Features](#advanced-features)
13+
- [Specifying Cargo Features](#specifying-cargo-features)
14+
- [Using Components Individually](#using-components-individually)
15+
- [Pre-built vs. Compiled](#pre-built-vs-compiled)
16+
- [Adding Support for New Versions](#adding-support-for-new-versions)
17+
- [Copyright](#copyright)
1618

1719
<!-- tocstop -->
1820

1921

2022
## Basic Example
2123

2224
A basic class for cargo-based executables is provided. The following is a
23-
simple recipe that builds the [gpio-utils](https://github.com/rust-embedded/gpio-utils)
24-
crate from a branch tagged with the version `${PV}`:
25+
simple recipe called gpio_utils.bb that builds the [gpio-utils](https://github.com/rust-embedded/gpio-utils)
26+
crate from branch master.
2527

2628
```bitbake
27-
inherit cargo
28-
2929
SUMMARY = "GPIO Utilities"
3030
HOMEPAGE = "git://github.com/rust-embedded/gpio-utils"
3131
LICENSE = "MIT"
3232
33-
SRC_URI = "https://github.com/rust-embedded/gpio-utils.git;tag=${PV}"
34-
S = "${WORKDIR}/git"
33+
inherit cargo
3534
35+
SRC_URI = "git://github.com/rust-embedded/gpio-utils.git;protocol=https;branch=master"
36+
SRCREV="02b0658cd7e13e46f6b1a5de3fd9655711749759"
37+
S = "${WORKDIR}/git"
3638
LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=935a9b2a57ae70704d8125b9c0e39059"
3739
```
3840

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)