Skip to content

feat: add support for yocto whinlatter #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
posborne merged 4 commits into from
Jul 21, 2026
+40 −10
Merged

feat: add support for yocto whinlatter #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f29ebb
Update to support yocto walnascar
MrTarantoga Dec 22, 2025
339c03d
Add support over different versions (tested walnascar)
MrTarantoga Dec 23, 2025
7f12d05
feat: support yocto whinlatter
hrueger Feb 18, 2026
363f58a
Merge remote-tracking branch 'origin/master' into whinlatter
hrueger Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions classes/cargo_bin.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
inherit rust_bin-common

python () {
layerseries = d.getVar("LAYERSERIES_COMPAT_core")

Copilot AI Feb 18, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check for layer series compatibility appears incorrect. The variable LAYERSERIES_COMPAT_core typically contains a space-separated list of all compatible layer series, not the current active series. To detect the current Yocto version, use the LAYERSERIES_CORENAMES variable instead, which contains the actual active layer series name. The check should be: layerseries = d.getVar("LAYERSERIES_CORENAMES") followed by if layerseries in ["walnascar", "whinlatter"]:

Suggested change
layerseries = d.getVar("LAYERSERIES_COMPAT_core")
layerseries = d.getVar("LAYERSERIES_CORENAMES")

Copilot uses AI. Check for mistakes.

@dwretman dwretman Jun 18, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment seems incorrect. In e.g. the nanbield release LAYERSERIES_COMPAT_core in the poky layer.conf is set to nanbield while LAYERSERIES_CORENAMES is set to nanbield mickledore. In the whinlatter release both are set to whinlatter.

I can't find any documentation that points to the statement that LAYERSERIES_CORENAMES should only contain the active series name.

To me LAYERSERIES_COMPAT_core seems to be the correct option.

if layerseries in ["walnascar", "whinlatter"]:
d.setVar("COMPATIBLE_PACKDIR", d.getVar("UNPACKDIR"))
else:
d.setVar("COMPATIBLE_PACKDIR", d.getVar("WORKDIR"))
}

# Many crates rely on pkg-config to find native versions of their libraries for
# linking - do the simple thing and make it generally available.
DEPENDS:append = "\
Expand All @@ -8,13 +16,13 @@ DEPENDS:append = "\
"

# Move CARGO_HOME from default of ~/.cargo
export CARGO_HOME = "${WORKDIR}/cargo_home"
export CARGO_HOME = "${COMPATIBLE_PACKDIR}/cargo_home"

# If something fails while building, this might give useful information
export RUST_BACKTRACE = "1"

# Do build out-of-tree
B = "${WORKDIR}/target"
B = "${COMPATIBLE_PACKDIR}/target"
export CARGO_TARGET_DIR = "${B}"

RUST_TARGET = "${@rust_target(d, 'TARGET')}"
Expand Down Expand Up @@ -45,7 +53,7 @@ def cargo_profile_to_builddir(profile):
}.get(profile, profile)

CARGO_BINDIR = "${B}/${RUST_TARGET}/${@cargo_profile_to_builddir(d.getVar('CARGO_BUILD_PROFILE'))}"
WRAPPER_DIR = "${WORKDIR}/wrappers"
WRAPPER_DIR = "${COMPATIBLE_PACKDIR}/wrappers"

# Set the Cargo manifest path to the typical location
CARGO_MANIFEST_PATH ?= "${S}/Cargo.toml"
Expand Down
2 changes: 2 additions & 0 deletions conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ LAYERSERIES_COMPAT_rust-bin-layer = " \
mickledore \
nanbield \
scarthgap \
walnascar \
whinlatter \
"
14 changes: 12 additions & 2 deletions recipes-devtools/rust/cargo-bin-cross.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ SECTION = "devel"
inherit cross
inherit rust_bin-common

python () {
layerseries = d.getVar("LAYERSERIES_COMPAT_core")

Copilot AI Feb 18, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check for layer series compatibility appears incorrect. The variable LAYERSERIES_COMPAT_core typically contains a space-separated list of all compatible layer series, not the current active series. To detect the current Yocto version, use the LAYERSERIES_CORENAMES variable instead, which contains the actual active layer series name. The check should be: layerseries = d.getVar("LAYERSERIES_CORENAMES") followed by if layerseries in ["walnascar", "whinlatter"]:

Suggested change
layerseries = d.getVar("LAYERSERIES_COMPAT_core")
layerseries = d.getVar("LAYERSERIES_CORENAMES")

Copilot uses AI. Check for mistakes.
if layerseries in ["walnascar", "whinlatter"]:
d.setVar("COMPATIBLE_PACKDIR", d.getVar("UNPACKDIR"))
d.setVar("COMPATIBLE_PACKDIR_string", "UNPACKDIR")
else:
d.setVar("COMPATIBLE_PACKDIR", d.getVar("WORKDIR"))
d.setVar("COMPATIBLE_PACKDIR_string", "WORKDIR")
}

PN = "cargo-bin-cross-${TARGET_ARCH}"

PROVIDES += "cargo-bin-native"
Expand Down Expand Up @@ -47,7 +57,7 @@ python () {
src_uri = d.getVar("SRC_URI", True).split()
cargo_extract_path = cargo_url(target).split('/')[-1].replace('.tar.gz', '')
d.setVar("SRC_URI", ' '.join(src_uri + [cargo_uri]))
d.setVar("S", "${{WORKDIR}}/{}".format(cargo_extract_path))
d.setVar("S", "${{COMPATIBLE_PACKDIR}}/{}".format(cargo_extract_path))
d.appendVarFlag("S", "vardeps", " cargo_url")
d.appendVarFlag("S", "vardepsexclude", " WORKDIR")
d.appendVarFlag("S", "vardepsexclude", " ${COMPATIBLE_PACKDIR_string}")
}
20 changes: 15 additions & 5 deletions recipes-devtools/rust/rust-bin-cross.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ SECTION = "devel"
inherit cross
inherit rust_bin-common

python () {
layerseries = d.getVar("LAYERSERIES_COMPAT_core")

Copilot AI Feb 18, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check for layer series compatibility appears incorrect. The variable LAYERSERIES_COMPAT_core typically contains a space-separated list of all compatible layer series, not the current active series. To detect the current Yocto version, use the LAYERSERIES_CORENAMES variable instead, which contains the actual active layer series name. The check should be: layerseries = d.getVar("LAYERSERIES_CORENAMES") followed by if layerseries in ["walnascar", "whinlatter"]:

Suggested change
layerseries = d.getVar("LAYERSERIES_COMPAT_core")
layerseries = d.getVar("LAYERSERIES_CORENAMES")

Copilot uses AI. Check for mistakes.
if layerseries in ["walnascar", "whinlatter"]:
d.setVar("COMPATIBLE_PACKDIR", d.getVar("UNPACKDIR"))
d.setVar("COMPATIBLE_PACKDIR_string", "UNPACKDIR")
else:
d.setVar("COMPATIBLE_PACKDIR", d.getVar("WORKDIR"))
d.setVar("COMPATIBLE_PACKDIR_string", "WORKDIR")
}

PN:class-native = "rust-bin-native-${BUILD_ARCH}"

# Required to link binaries
Expand All @@ -27,14 +37,14 @@ def get_s(d):
nightly = pv.startswith("nightly-")

if nightly:
return "${WORKDIR}/rustc-nightly-${RUST_BUILD_TARGET}"
return "${COMPATIBLE_PACKDIR}/rustc-nightly-${RUST_BUILD_TARGET}"
else:
return "${WORKDIR}/rustc-${PV}-${RUST_BUILD_TARGET}"
return "${COMPATIBLE_PACKDIR}/rustc-${PV}-${RUST_BUILD_TARGET}"

S = "${@get_s(d)}"

# Relocating WORKDIR doesn't matter to installer
S[vardepsexclude] += "WORKDIR"
# Relocating UNPACKDIR/WORKDIR doesn't matter to installer
S[vardepsexclude] += "${COMPATIBLE_PACKDIR_string}"

SYSROOT_DIRS_NATIVE += "${prefix}"
SYSROOT_DIRS_IGNORE += "\
Expand All @@ -51,7 +61,7 @@ fakeroot do_install() {
${S}/install.sh --destdir="${D}" --prefix="${prefix}"

# Install rust standard libraries
cd ${WORKDIR}/rust-std
cd ${COMPATIBLE_PACKDIR}/rust-std
for subdir in *; do
$subdir/install.sh --destdir="${D}" --prefix="${prefix}"
done
Expand Down
Loading