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

libecl: checked out recent commit of master #9339

Merged
merged 1 commit into from
Apr 19, 2018
Merged

libecl: checked out recent commit of master #9339

merged 1 commit into from
Apr 19, 2018

Conversation

potaito
Copy link
Contributor

@potaito potaito commented Apr 19, 2018

Fixes #9338

Currently the submodule src/lib/ecl points to this commit, which is not on master: https:/PX4/ecl/tree/8678cc42ba6c87b3ae0724af2becb62b71bf6683

The commit is on master, but under a different commit hash: PX4/PX4-ECL@bd72f3c

What I did for fixing it:

cd src/lib/ecl
git checkout bd72f3c5211176351cbc0596ef69395d359be43d
cd ..
git commit

@dagar can you verify?

@potaito potaito self-assigned this Apr 19, 2018
@potaito potaito requested a review from dagar April 19, 2018 14:56
@dagar dagar mentioned this pull request Apr 19, 2018
@dagar
Copy link
Member

dagar commented Apr 19, 2018

Looks good, the other thing you can do is update with --remote. This updates the submodule to the branch listed in .gitmodules.

Update ecl to latest commit in the master branch.

 % git submodule update --init --force --remote src/lib/ecl
Submodule path 'src/lib/ecl': checked out 'bd72f3c5211176351cbc0596ef69395d359be43d'

Update all submodules to the latest commits.

 % git submodule update --init --force --remote
Submodule 'Tools/jMAVSim' (https:/PX4/jMAVSim.git) registered for path 'Tools/jMAVSim'
Submodule 'Tools/sitl_gazebo' (https:/PX4/sitl_gazebo.git) registered for path 'Tools/sitl_gazebo'
Submodule 'cmake/cmake_hexagon' (https:/ATLFlight/cmake_hexagon.git) registered for path 'cmake/cmake_hexagon'
Submodule 'cmake/configs/uavcan_board_ident' (https:/PX4/uavcan_board_ident.git) registered for path 'cmake/configs/uavcan_board_ident'
Submodule 'mavlink/include/mavlink/v2.0' (https:/mavlink/c_library_v2.git) registered for path 'mavlink/include/mavlink/v2.0'
Submodule 'msg/tools/gencpp' (https:/ros/gencpp.git) registered for path 'msg/tools/gencpp'
Submodule 'msg/tools/genmsg' (https:/ros/genmsg.git) registered for path 'msg/tools/genmsg'
Submodule 'platforms/nuttx/NuttX/apps' (https:/PX4-NuttX/apps.git) registered for path 'platforms/nuttx/NuttX/apps'
Submodule 'platforms/nuttx/NuttX/nuttx' (https:/PX4-NuttX/nuttx.git) registered for path 'platforms/nuttx/NuttX/nuttx'
Submodule 'src/drivers/gps/devices' (https:/PX4/GpsDrivers.git) registered for path 'src/drivers/gps/devices'
Submodule 'src/lib/DriverFramework' (https:/PX4/DriverFramework.git) registered for path 'src/lib/DriverFramework'
Submodule 'src/lib/ecl' (https:/PX4/ecl.git) registered for path 'src/lib/ecl'
Submodule 'src/lib/matrix' (https:/PX4/Matrix.git) registered for path 'src/lib/matrix'
Submodule 'src/modules/micrortps_bridge/micro-CDR' (https:/eProsima/micro-CDR.git) registered for path 'src/modules/micrortps_bridge/micro-CDR'
Submodule 'src/modules/uavcan/libuavcan' (https:/UAVCAN/libuavcan.git) registered for path 'src/modules/uavcan/libuavcan'
Submodule path 'Tools/jMAVSim': checked out 'e0e8b6ca473a6eecc3ee2984ea414e321f6808c6'
Submodule path 'Tools/sitl_gazebo': checked out '0df46c53b14ef4241b33fb7a74a3cb6f9d83c6dd'
Submodule path 'cmake/cmake_hexagon': checked out '08fd0a73045346448adf6969660196228b23e1fa'
Submodule path 'cmake/configs/uavcan_board_ident': checked out '2e5f9d6768b1dbffc006dc2ceeb2bfe120f22163'
Submodule path 'mavlink/include/mavlink/v2.0': checked out '6aaf63842c4fbb1b7cfb29a628447212cc9c1bcc'
Submodule path 'msg/tools/gencpp': checked out 'b41ee3060badd660662e21cd9d4f81971c87a420'
Submodule path 'msg/tools/genmsg': checked out '3cea1fe528cd7ecdae7f8930fe90451271aec937'
Submodule path 'platforms/nuttx/NuttX/apps': checked out '7e2f17db4e770e65ee39b1a964cf4644720d976c'
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 9 (delta 5), reused 9 (delta 5), pack-reused 0
Unpacking objects: 100% (9/9), done.
From https:/PX4-NuttX/nuttx
 + e877bab...b1756b3 px4-master_auto_rebase -> origin/px4-master_auto_rebase  (forced update)
Submodule path 'platforms/nuttx/NuttX/nuttx': checked out 'fe0dc6c41a6bd7d942945459ac960ff2d3e1f4fc'
Submodule path 'src/drivers/gps/devices': checked out 'a5cf54a2e14e1c6f3ff443f7f13eba31782c0460'
Submodule path 'src/lib/DriverFramework': checked out 'e06222dd151e2f92476762e483915df5bd67929d'
Submodule path 'src/lib/ecl': checked out 'bd72f3c5211176351cbc0596ef69395d359be43d'
Submodule path 'src/lib/matrix': checked out '21d47424c6050bb94da5de3f7580a8df66b6fcc7'
Submodule path 'src/modules/micrortps_bridge/micro-CDR': checked out '309c5cec73ba67a351ee320722021c632c5e3871'
Submodule path 'src/modules/uavcan/libuavcan': checked out 'dbd037b0823cf6d347b3e145199a1ba1032139e4'

@potaito
Copy link
Contributor Author

potaito commented Apr 19, 2018

Got it, thanks for the hint 👍

@barzanisar
Copy link

barzanisar commented Apr 19, 2018

@dagar I faced the same issue. My origin is my fork and upstream is https:/PX4/Firmware
Should I do the same?

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.

submodule lib/ecl unable to checkout
3 participants