Skip to content
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.

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

Merge latest upstream #20

Merged

Conversation

erickshepherdNI
Copy link

@erickshepherdNI erickshepherdNI commented Jan 10, 2025

Merge latest from upstream. No conflicts.

AB#2951035

Testing:

  • Ran "bitbake packagefeed-ni-core"
  • Ran "bitbake packagegroup-ni-desirable"
  • Ran "bitbake package-index && bitbake nilrt-base-system-image"
  • Reimaged a cRIO (9033, 9037, and 9053) with the new base image and successfully booted it

hnez and others added 2 commits November 29, 2024 10:43
The workflow file is based on the current config on the master branch.

Signed-off-by: Leonard Göhrs <[email protected]>
If IMAGE_FSTYPES is empty, split() will return an empty array, resulting
in an `IndexError: list index out of range` error during parsing. The
`or ""` appears to be a previous attempt to handle this, but it is
ineffective, and not actually needed: OE-core's bitbake.conf contains a
default assignment for `IMAGE_FSTYPES`, so d.getVar() should always
return a (possibly empty) string.

We have come across this issue in combination with meta-ti, which
defines a multiconfig + additional machine for the Cortex-R5 core of TI
SoCs. This machine is only used to build bootloader and firmware recipes,
so IMAGE_FSTYPES is empty. As all recipes are parsed for all multiconfigs
unless skipped explicitly, just the existence of the core-bundle-minimal
recipe is enough to bring down the whole build in this configuration.

Signed-off-by: Matthias Schiffer <[email protected]>
(cherry picked from commit a04182b8bab888d4fb675de7a4a2c879f3f587d9)
Signed-off-by: Matthias Schiffer <[email protected]>
@erickshepherdNI erickshepherdNI marked this pull request as draft January 10, 2025 20:13
@erickshepherdNI erickshepherdNI marked this pull request as ready for review January 15, 2025 21:46
@chaitu236 chaitu236 requested a review from a team January 16, 2025 18:21
@chaitu236 chaitu236 merged commit 8f35e94 into ni:nilrt/master/scarthgap Jan 16, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants