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

Move support to v2.7.x and v3.1.0 #64

Merged
merged 9 commits into from
Aug 9, 2022
Merged

Move support to v2.7.x and v3.1.0 #64

merged 9 commits into from
Aug 9, 2022

Conversation

pablogs9
Copy link
Member

Signed-off-by: Pablo Garrido [email protected]

@uLipe
Copy link

uLipe commented Jul 28, 2022

@pablogs9 as I said here, to get this working we would need to update some points:

  • USB-Serial now used device tree to get enabled, but applying this update will break the compatibillity with previous Zephyr releases;
  • Wait ros2 accept the rcuitls patch, for the posix timer implementation and update the commit used by libmicroros, currently I created a diff and patching locally and wrote this instruction in the app I'm working on top of this module.

Also I'm taking some time to refactor the zephyr transports for serial to use the up to date DT macros instead of using device labels, this is compatible across zephyr releases and scalable as long Zephyr evolves, probably will push this PR today or tomorrow.

@uLipe
Copy link

uLipe commented Aug 5, 2022

Sure, I will take some time to look into :)

@pablogs9 pablogs9 changed the title Add v2.7.0 and v3.1.0 Add v2.7.0 and v3.1.0 / Deprecate v2.4.0 Aug 9, 2022
@pablogs9
Copy link
Member Author

pablogs9 commented Aug 9, 2022

@mergify backport humble galactic foxy

@mergify
Copy link
Contributor

mergify bot commented Aug 9, 2022

backport humble galactic foxy

✅ Backports have been created

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Use ubuntu 20.04

Signed-off-by: Pablo Garrido <[email protected]>

Update cmake

Signed-off-by: Pablo Garrido <[email protected]>

Fix env

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Deprecate v2.4.0

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

Update Readme

Signed-off-by: Pablo Garrido <[email protected]>

Fix CMake

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>
Signed-off-by: Pablo Garrido <[email protected]>
@pablogs9 pablogs9 force-pushed the feature/update_module branch from 6f8d44e to d4a8906 Compare August 9, 2022 08:38
Signed-off-by: Pablo Garrido <[email protected]>
Signed-off-by: Pablo Garrido <[email protected]>
Signed-off-by: Pablo Garrido <[email protected]>
Signed-off-by: Pablo Garrido <[email protected]>
Signed-off-by: Pablo Garrido <[email protected]>
@pablogs9 pablogs9 changed the title Add v2.7.0 and v3.1.0 / Deprecate v2.4.0 Move support to v2.7.x and v3.1.0 Aug 9, 2022
Signed-off-by: Pablo Garrido <[email protected]>
@pablogs9 pablogs9 merged commit 07797df into main Aug 9, 2022
@pablogs9 pablogs9 deleted the feature/update_module branch August 9, 2022 09:35
mergify bot pushed a commit that referenced this pull request Aug 9, 2022
* Add v2.7.0 and v3.1.0

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Use ubuntu 20.04

Signed-off-by: Pablo Garrido <[email protected]>

Update cmake

Signed-off-by: Pablo Garrido <[email protected]>

Fix env

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Deprecate v2.4.0

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

Update Readme

Signed-off-by: Pablo Garrido <[email protected]>

Fix CMake

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

* Revert "Add v2.7.0 and v3.1.0"

This reverts commit 64370f1.

* Initial

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Move 2.7.2 to new ci

Signed-off-by: Pablo Garrido <[email protected]>

* Deprecate <v2.7

Signed-off-by: Pablo Garrido <[email protected]>

* Readme

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit 07797df)

# Conflicts:
#	.github/workflows/nightly.yml
mergify bot pushed a commit that referenced this pull request Aug 9, 2022
* Add v2.7.0 and v3.1.0

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Use ubuntu 20.04

Signed-off-by: Pablo Garrido <[email protected]>

Update cmake

Signed-off-by: Pablo Garrido <[email protected]>

Fix env

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Deprecate v2.4.0

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

Update Readme

Signed-off-by: Pablo Garrido <[email protected]>

Fix CMake

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

* Revert "Add v2.7.0 and v3.1.0"

This reverts commit 64370f1.

* Initial

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Move 2.7.2 to new ci

Signed-off-by: Pablo Garrido <[email protected]>

* Deprecate <v2.7

Signed-off-by: Pablo Garrido <[email protected]>

* Readme

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit 07797df)

# Conflicts:
#	.github/workflows/nightly.yml
mergify bot pushed a commit that referenced this pull request Aug 9, 2022
* Add v2.7.0 and v3.1.0

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Use ubuntu 20.04

Signed-off-by: Pablo Garrido <[email protected]>

Update cmake

Signed-off-by: Pablo Garrido <[email protected]>

Fix env

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Deprecate v2.4.0

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

Update Readme

Signed-off-by: Pablo Garrido <[email protected]>

Fix CMake

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

* Revert "Add v2.7.0 and v3.1.0"

This reverts commit 64370f1.

* Initial

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Move 2.7.2 to new ci

Signed-off-by: Pablo Garrido <[email protected]>

* Deprecate <v2.7

Signed-off-by: Pablo Garrido <[email protected]>

* Readme

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit 07797df)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml
#	README.md
pablogs9 added a commit that referenced this pull request Aug 9, 2022
* Move support to v2.7.x and v3.1.0 (#64)

* Add v2.7.0 and v3.1.0

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Use ubuntu 20.04

Signed-off-by: Pablo Garrido <[email protected]>

Update cmake

Signed-off-by: Pablo Garrido <[email protected]>

Fix env

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Deprecate v2.4.0

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

Update Readme

Signed-off-by: Pablo Garrido <[email protected]>

Fix CMake

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

* Revert "Add v2.7.0 and v3.1.0"

This reverts commit 64370f1.

* Initial

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Move 2.7.2 to new ci

Signed-off-by: Pablo Garrido <[email protected]>

* Deprecate <v2.7

Signed-off-by: Pablo Garrido <[email protected]>

* Readme

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit 07797df)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml
#	README.md

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

Co-authored-by: Pablo Garrido <[email protected]>
pablogs9 added a commit that referenced this pull request Aug 9, 2022
* Move support to v2.7.x and v3.1.0 (#64)

* Add v2.7.0 and v3.1.0

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Use ubuntu 20.04

Signed-off-by: Pablo Garrido <[email protected]>

Update cmake

Signed-off-by: Pablo Garrido <[email protected]>

Fix env

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Deprecate v2.4.0

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

Update Readme

Signed-off-by: Pablo Garrido <[email protected]>

Fix CMake

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

* Revert "Add v2.7.0 and v3.1.0"

This reverts commit 64370f1.

* Initial

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Move 2.7.2 to new ci

Signed-off-by: Pablo Garrido <[email protected]>

* Deprecate <v2.7

Signed-off-by: Pablo Garrido <[email protected]>

* Readme

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit 07797df)

# Conflicts:
#	.github/workflows/nightly.yml

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

Co-authored-by: Pablo Garrido <[email protected]>
pablogs9 added a commit that referenced this pull request Aug 9, 2022
* Move support to v2.7.x and v3.1.0 (#64)

* Add v2.7.0 and v3.1.0

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Use ubuntu 20.04

Signed-off-by: Pablo Garrido <[email protected]>

Update cmake

Signed-off-by: Pablo Garrido <[email protected]>

Fix env

Signed-off-by: Pablo Garrido <[email protected]>

Fix

Signed-off-by: Pablo Garrido <[email protected]>

Deprecate v2.4.0

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

Update Readme

Signed-off-by: Pablo Garrido <[email protected]>

Fix CMake

Signed-off-by: Pablo Garrido <[email protected]>

Update

Signed-off-by: Pablo Garrido <[email protected]>

* Revert "Add v2.7.0 and v3.1.0"

This reverts commit 64370f1.

* Initial

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Update

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Move 2.7.2 to new ci

Signed-off-by: Pablo Garrido <[email protected]>

* Deprecate <v2.7

Signed-off-by: Pablo Garrido <[email protected]>

* Readme

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit 07797df)

# Conflicts:
#	.github/workflows/nightly.yml

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

Co-authored-by: Pablo Garrido <[email protected]>
@Acuadros95
Copy link
Contributor

FYI @pablogs9 @uLipe , we need to change zephyr include paths for v.3.1.0 and beyond:

https://github.com/zephyrproject-rtos/zephyr/releases/tag/zephyr-v3.1.0:

All Zephyr public headers have been moved to include/zephyr, meaning they
need to be prefixed with <zephyr/...> when included. Because this change
can potentially break many applications or libraries,
:kconfig:option:CONFIG_LEGACY_INCLUDE_PATH is provided to allow using the
old include path. This option is now enabled by default to allow a smooth
transition. In order to facilitate the migration to the new include prefix, a
script to automate the process is also provided:
:zephyr_file:scripts/utils/migrate_includes.py.

@uLipe
Copy link

uLipe commented Aug 17, 2022 via email

@pablogs9
Copy link
Member Author

Do we have any define in the Zephyr build system indicating the version so we can conditionally include the correct header?

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.

3 participants