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.

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

Jump to bottom

Modified zephyr create.sh to pull correct toolchain based on arch #499

Merged
merged 1 commit into from
Apr 18, 2022
Merged

Modified zephyr create.sh to pull correct toolchain based on arch #499

merged 1 commit into from
Apr 18, 2022

Conversation

ahoenerBE
Copy link
Contributor

@ahoenerBE ahoenerBE commented Apr 15, 2022 •
edited
Loading

Currently the create.sh script only pulls down an x86 version of zephyr regardless of the arch of the system the user is building on.
We have a few people that are using M1 macbooks with Ubuntu VMs and this has been causing a bit of trouble since the workspace never gets setup correctly with the right toolchain.

Currently just for galactic but I can make another PR for other versions if necessary

Proposed fix: Read the arch of the system and pull down the aarch64 version if necessary.
Using v0.13.1 for arm as that's what was recommended to me

@Acuadros95
Copy link
Contributor

LGTM

@Acuadros95 Acuadros95 merged commit 8793b5a into micro-ROS:galactic Apr 18, 2022
@Acuadros95
Copy link
Contributor

@mergify backport main foxy

mergify bot pushed a commit that referenced this pull request Apr 18, 2022
@ahoenerBE
Modified zephyr create.sh to pull correct toolchain based on arch (#499)
5121d7a 
(cherry picked from commit 8793b5a)
@mergify mergify bot mentioned this pull request Apr 18, 2022
Merged
mergify bot pushed a commit that referenced this pull request Apr 18, 2022
@ahoenerBE
Modified zephyr create.sh to pull correct toolchain based on arch (#499)
648771f 
(cherry picked from commit 8793b5a)
@mergify mergify bot mentioned this pull request Apr 18, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Apr 18, 2022

backport main foxy

✅ Backports have been created

Acuadros95 pushed a commit that referenced this pull request Apr 18, 2022
@mergify @ahoenerBE
Modified zephyr create.sh to pull correct toolchain based on arch (#499…
e3842c3 
…) (#501)

(cherry picked from commit 8793b5a)

Co-authored-by: Drew Hoener <84148896+ahoenerBE@users.noreply.github.com>
Acuadros95 pushed a commit that referenced this pull request Apr 18, 2022
@mergify @ahoenerBE
Modified zephyr create.sh to pull correct toolchain based on arch (#499…
d4722ef 
…) (#500)

(cherry picked from commit 8793b5a)

Co-authored-by: Drew Hoener <84148896+ahoenerBE@users.noreply.github.com>
nomumu added a commit to nomumu/micro_ros_setup that referenced this pull request Sep 12, 2022
@nomumu @mergify
@pablogs9 @bhavesh-sr @dayjaby @ZhenshengLee @ahoenerBE @Acuadros95 @k7g03z
Sync fork (#1)
650fecf 
* Update yaml_filter.py (micro-ROS#365) (micro-ROS#367)

(cherry picked from commit ce41dcb)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Support for flashing Olimex STM32-E407 with STLINK v2 debuggers (micro-ROS#374)

* Update standalone build tools section (backport micro-ROS#380) (micro-ROS#382)

* Update standalone build tools section (micro-ROS#380)

* Update standalone build tools section

* Upd

* Updates

(cherry picked from commit e13e64d)

# Conflicts:
#	README.md

* Update

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Simplify micro-ROS Agent build (micro-ROS#378) (micro-ROS#384)

* Simplify agent build

* Revert this

* Update config/agent_uros_packages.repos

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
(cherry picked from commit 70ccf66)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Update README.md (micro-ROS#386) (micro-ROS#387)

(cherry picked from commit a4c138e)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Add renesas RA6M5 (backport micro-ROS#390) (micro-ROS#391)

* Add renesas RA6M5 (micro-ROS#390)

* Add renesas RA6M5

* Fix

* Avoid toolchain

(cherry picked from commit d27b83e)

# Conflicts:
#	README.md

* Fix

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* openocd: added script to reset devices (micro-ROS#399)

* fix: use FW_TARGETDIR instead of firmware (micro-ROS#400)

* Temporal disable Rolling Agent CI (backport micro-ROS#408) (micro-ROS#410)

* Temporal disable Rolling Agent CI (micro-ROS#408)

(cherry picked from commit 218170b)

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

* Update nightly.yml

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Remove unnecessary rosdep (micro-ROS#411) (micro-ROS#412)

(cherry picked from commit c03d66e)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Fix rosdep (backport micro-ROS#414) (micro-ROS#415)

* Fix rosdep (micro-ROS#414)

* Fix rosdep

* Update

(cherry picked from commit 3a28e75)

# Conflicts:
#	scripts/create_firmware_ws.sh

* Fix conflicts

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Modify host build (micro-ROS#418) (micro-ROS#421)

(cherry picked from commit 97f013e)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Skip existing repos in vcs (micro-ROS#419) (micro-ROS#423)

(cherry picked from commit ecdd1ab)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Fix host src folder (micro-ROS#417) (micro-ROS#425)

(cherry picked from commit fc7faa3)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Build dynamic lib of rosidl_typesupport _microxrcedds (backport micro-ROS#473) (micro-ROS#475)

* build dynamic lib of rosidl_typesupport of (micro-ROS#473)

microxrcedds_c

(cherry picked from commit 3136ad0)

# Conflicts:
#	config/host/generic/build.sh
#	config/host/generic/client_host_packages.repos

* Conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: VictorLee <lzs_1993@qq.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Fix Zephyr CI (backport micro-ROS#480) (micro-ROS#482)

* Fix Zephyr CI (micro-ROS#480)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit 0942f74)

# Conflicts:
#	config/zephyr/generic/create.sh

* Update

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Update changelog

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* 1.0.0

* Enable rolling agent (backport micro-ROS#479) (micro-ROS#484)

* Enable rolling agent (micro-ROS#479)

* Enable rolling agent

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Install python3.9-dev

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Fix

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit 91ed371)

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

* update

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Fix CI

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Fix CI

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Fix Agent and host Rolling CI (backport micro-ROS#486) (micro-ROS#487)

* Fix Agent and host Rolling CI (micro-ROS#486)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit d71ce51)

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

* Fix 

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Fix CI upgrade ROS docker (micro-ROS#489)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Remove Python 3.9 (backport micro-ROS#496) (micro-ROS#497)

* Remove Python 3.9 (micro-ROS#496)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit d327cba)

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

* Update

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Modified zephyr create.sh to pull correct toolchain based on arch (micro-ROS#499) (micro-ROS#501)

(cherry picked from commit 8793b5a)

Co-authored-by: Drew Hoener <84148896+ahoenerBE@users.noreply.github.com>

* Fix readme rosdep (micro-ROS#506) (micro-ROS#507)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit c546b01)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Add platformIO to Readme (micro-ROS#510) (micro-ROS#511)

(cherry picked from commit f0e7398)

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>

* Add renesas dummy meta (micro-ROS#516) (micro-ROS#517)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit c1ee153)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Fix PyYaml unistall error (micro-ROS#521)

* Update changelog

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* 1.1.0

* Remove unnessary check (micro-ROS#553) (micro-ROS#567)

Signed-off-by: Kevin Goez <kevin.goez@apex.ai>

Signed-off-by: Kevin Goez <kevin.goez@apex.ai>
(cherry picked from commit b81290a)

Co-authored-by: k7g03z <88199521+k7g03z@users.noreply.github.com>

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Co-authored-by: Bhavesh Kakwani <67327096+bhavesh-sr@users.noreply.github.com>
Co-authored-by: David Jablonski <dayjaby@gmail.com>
Co-authored-by: VictorLee <lzs_1993@qq.com>
Co-authored-by: Drew Hoener <84148896+ahoenerBE@users.noreply.github.com>
Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
Co-authored-by: k7g03z <88199521+k7g03z@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogs9 pablogs9 pablogs9 approved these changes

@Acuadros95 Acuadros95 Awaiting requested review from Acuadros95

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ahoenerBE @Acuadros95 @pablogs9