Skip to content
New issue

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

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

Already on GitHub? # to your account

Fix some zephyr build issues #2160

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Fix some zephyr build issues #2160

merged 1 commit into from
Jan 24, 2024

Conversation

erlingrj
Copy link
Collaborator

@erlingrj erlingrj commented Jan 22, 2024

  1. The user-provided prj.conf was not included.
  2. We generated CMake code that linked against some Zephyr kernel library this generated a cyclic-dependency. I am trying to remove this linkage and lets see if all the tests still pass

@erlingrj erlingrj marked this pull request as draft January 22, 2024 17:13
@erlingrj
Copy link
Collaborator Author

Unfortunately, I am not able to find a good solution to this. It is strangely complicated to just link the following three things without creating a CMake target cycle or other linker issues:

  1. Reactor-c library
  2. LF application
  3. Zephyr kernel

Im afraid I will have to come back to this in March

@erlingrj
Copy link
Collaborator Author

I am updating this PR to just fix a tiny mistake in the code-generated CMakeLists for Zephyr. Now we check for any prj.conf file in the src-gen directory and includes it. This is used by our custom west command.

@erlingrj erlingrj marked this pull request as ready for review January 23, 2024 16:56
@erlingrj erlingrj requested a review from lhstrh January 24, 2024 09:14
@erlingrj
Copy link
Collaborator Author

@lhstrh, all tests pass except the label-test which doesn't pass when I re-run it, even though there now is a label. We don't need to rerun the entire test suite to get it all green I think...

@lhstrh lhstrh added the bugfix label Jan 24, 2024
@lhstrh
Copy link
Member

lhstrh commented Jan 24, 2024

The reason for the test failure is clear from the output:

Error: Label error. Requires at least 1 of: feature, enhancement, fix, bug, bugfix, cleanup, refactoring, documentation, docs, test, tests, testing, upgrade, bump, dependency, version, misc, miscellaneous, ignore, exclude, trivial, duplicate, question, invalid, wontfix, ci, automated, experimental. Found: zephyr

I added the label bugfix.

@lhstrh lhstrh enabled auto-merge January 24, 2024 21:41
Copy link
Member

@lhstrh lhstrh left a comment

Choose a reason for hiding this comment

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

👍

@lhstrh lhstrh added this pull request to the merge queue Jan 24, 2024
Merged via the queue into master with commit b9e4795 Jan 24, 2024
48 of 61 checks passed
@lhstrh lhstrh deleted the zephyr-esp-issue branch January 24, 2024 23:20
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants