Skip to content

Merge upstream 20211223#89

Merged
at-wat merged 1420 commits intoalpine-custom-apkfrom
merge-upstream-20211223
Dec 23, 2021
Merged

Merge upstream 20211223#89
at-wat merged 1420 commits intoalpine-custom-apkfrom
merge-upstream-20211223

Conversation

@at-wat
Copy link
Copy Markdown
Member

@at-wat at-wat commented Dec 23, 2021 •
edited
Loading

Alpine related upstream rosdep diffs:

 bison:
+  alpine: [bison]
 --
+e2fsprogs:
+  alpine: [e2fsprogs]
 --
 libatomic:
+  alpine: [libatomic]
 --
+libcurl:
+  alpine: [libcurl]
 --
+libcurl-dev:
+  alpine: [curl-dev]
 --
+libext2fs-dev:
+  alpine: [e2fsprogs-dev]
 --
+libgnutls28-dev:
+  alpine: [gnutls-dev]
 --
+libmnl-dev:
+  alpine: [libmnl-dev]
 --
 libqt5-serialport:
-  alpine: [qt5-qtserialport-dev]
+  alpine: [qt5-qtserialport]
 --
+libqt5-serialport-dev:
+  alpine: [qt5-qtserialport-dev]
 --
+libtins-dev:
+  alpine: [libtins-dev]
 --
+libwebsockets-dev:
+  alpine: [libwebsockets-dev]
 --
 python3:
-  alpine: [python3-dev]
+  alpine: [python3]
 --
+python3-alembic:
+  alpine: [py3-alembic]
 --
 python3-dev:
+  alpine: [python3-dev]
 --
 python3-importlib-metadata:
+  alpine: [py3-importlib-metadata]
 --
 python3-packaging:
+  alpine: [py3-packaging]
 --
+python3-pygments:
+  alpine: [py3-pygments]
 --
+python3-pytest-asyncio:
+  alpine: [py3-pytest-asyncio]
 --
+python3-sqlalchemy-utils:
+  alpine: [py3-sqlalchemy-utils]

danthony06 and others added 30 commits November 17, 2021 11:40
@danthony06
marti_messages: 1.3.0-1 in 'foxy/distribution.yaml' [bloom] (ros#31249)
3825ff8
@danthony06
marti_common: 3.4.0-1 in 'foxy/distribution.yaml' [bloom] (ros#31252)
18d0f51
@clalancette
rcpputils: 2.3.0-1 in 'rolling/distribution.yaml' [bloom] (ros#31264)
76f1967
@danthony06
marti_common: 3.4.0-1 in 'rolling/distribution.yaml' [bloom] (ros#31254)
be606d8
@danthony06
marti_messages: 1.3.0-1 in 'rolling/distribution.yaml' [bloom] (ros#3…
efd85f3 
…1251)
@JanStaschulat
rclc: 3.0.4-1 in 'rolling/distribution.yaml' [bloom] (ros#31247)
50467b6
@ROBOTIS-Will
turtlebot3: 2.1.2-2 in 'galactic/distribution.yaml' [bloom] (ros#31237)
97a1508
@jacobperron
launch_ros: 0.11.5-1 in 'foxy/distribution.yaml' [bloom] (ros#31245)
8a1b4f5
@Levi-Armstrong
tesseract: 0.6.7-1 in 'noetic/distribution.yaml' [bloom] (ros#31246)
b3b099e
@danthony06
marti_messages: 1.3.0-1 in 'galactic/distribution.yaml' [bloom] (ros#…
0d01454 
…31250)
@danthony06
marti_common: 3.4.0-1 in 'galactic/distribution.yaml' [bloom] (ros#31253
538e715 
)
@ahcorde
gazebo_ros2_control: 0.0.6-1 in 'galactic/distribution.yaml' [bloom] (r…
be38fb6 
…os#31259)
@umbertofontana93
qb_chain: 2.2.3-1 in 'melodic/distribution.yaml' [bloom] (ros#31261)
a667847
@umbertofontana93
qb_chain: 2.2.3-1 in 'noetic/distribution.yaml' [bloom] (ros#31262)
7e391c7
@rhaschke
moveit_resources: 0.8.2-1 in 'noetic/distribution.yaml' [bloom] (ros#…
dc49594 
…31265)
@clalancette
rosidl_typesupport_fastrtps: 2.0.3-1 in 'rolling/distribution.yaml' […
7d4e3b4 
…bloom] (ros#31266)
@clalancette
rviz: 9.0.0-1 in 'rolling/distribution.yaml' [bloom] (ros#31267)
973fa6f
@clalancette
ros2cli: 0.15.0-1 in 'rolling/distribution.yaml' [bloom] (ros#31268)
dcd95bf
@clalancette
rmw_implementation: 2.6.1-1 in 'rolling/distribution.yaml' [bloom] (r…
c01a03e 
…os#31269)
@clalancette
rcl_logging: 2.2.0-1 in 'rolling/distribution.yaml' [bloom] (ros#31270)
651e8cf
@clalancette
turtlesim: 1.4.0-1 in 'rolling/distribution.yaml' [bloom] (ros#31271)
c69c76b
@ivanpauno
rmw: 5.1.0-2 in 'rolling/distribution.yaml' [bloom] (ros#31275)
54338e3
@ivanpauno
rmw_cyclonedds: 1.1.0-1 in 'rolling/distribution.yaml' [bloom] (ros#3…
c766076 
…1277)
@ivanpauno
rmw_connextdds: 0.8.1-1 in 'rolling/distribution.yaml' [bloom] (ros#3…
f5cd40c 
…1278)
@ivanpauno
rmw_implementation: 2.7.0-1 in 'rolling/distribution.yaml' [bloom] (r…
e599423 
…os#31279)
@ivanpauno
rmw_fastrtps: 6.1.0-1 in 'rolling/distribution.yaml' [bloom] (ros#31276)
635c2df
@JafarAbdi
moveit: 2.2.2-1 in 'foxy/distribution.yaml' [bloom] (ros#31274)
4b5d98a
@matlabbe
find_object_2d: 0.6.4-2 in 'melodic/distribution.yaml' [bloom] (ros#3…
2059ef4 
…1282)
@mabelzhang
rqt_topic: 0.4.13-1 in 'noetic/distribution.yaml' [bloom] (ros#31272)
9c90556
@DLu
snowbot_operating_system: 0.0.1-1 in 'melodic/distribution.yaml' [blo…
6d70eff 
…om] (ros#31244)
martiniil and others added 8 commits December 22, 2021 11:16
@martiniil
psen_scan_v2: 0.3.4-1 in 'noetic/distribution.yaml' [bloom] (ros#31521)
8aebd1f
@cottsay
rmw_cyclonedds: 0.22.4-1 in 'galactic/distribution.yaml' [bloom] (ros…
ab7aa79 
…#31555)
@robbiefish
microstrain_inertial: 2.3.0-1 in 'galactic/distribution.yaml' [bloom] (…
4e08ba3 
…ros#31548)
@lenpuc
sick_safetyscanners_base: 1.0.1-1 in 'galactic/distribution.yaml' [bl…
848762f 
…oom] (ros#31539)
@bmagyar
ros2_control: 1.3.0-1 in 'galactic/distribution.yaml' [bloom] (ros#31531
bc73ddc 
)
@lenpuc
sick_safetyscanners2_interfaces: 1.0.0-1 in 'galactic/distribution.ya…
58af6d5 
…ml' [bloom] (ros#31540)
@lenpuc
sick_safetyscanners2: 1.0.3-1 in 'galactic/distribution.yaml' [bloom] (…
0b11004 
…ros#31542)
@cottsay
Revert "sick_safetyscanners2: 1.0.3-1 in 'galactic/distribution.yaml'…
d234db9 
… [bloom]" (ros#31558)

This package was not released properly and needs to be re-released.

This reverts commit 0b11004.
@at-wat at-wat self-assigned this Dec 23, 2021
@at-wat at-wat force-pushed the merge-upstream-20211223 branch 3 times, most recently from 48ad15e to 70004f1 Compare December 23, 2021 07:14
@at-wat at-wat force-pushed the merge-upstream-20211223 branch from 70004f1 to 16da4d8 Compare December 23, 2021 08:00
@at-wat at-wat force-pushed the merge-upstream-20211223 branch from a7c07a6 to 461c66f Compare December 23, 2021 08:19
@at-wat at-wat mentioned this pull request Dec 23, 2021
Merged
@at-wat at-wat requested a review from f-fl0 December 23, 2021 08:37
@at-wat
Copy link
Copy Markdown
Member Author

at-wat commented Dec 23, 2021

@f-fl0 please take a look
Diffs not from upstream: https://github.com/alpine-ros/rosdistro/compare/1b7d208..461c66f

f-fl0
f-fl0 approved these changes Dec 23, 2021
View reviewed changes
Copy link
Copy Markdown

@f-fl0 f-fl0 left a comment

Choose a reason for hiding this comment

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

LGTM

@at-wat at-wat merged commit af3a79a into alpine-custom-apk Dec 23, 2021
@at-wat at-wat deleted the merge-upstream-20211223 branch December 23, 2021 13:23
@at-wat at-wat mentioned this pull request Dec 23, 2021
Closed
at-wat added a commit that referenced this pull request Dec 24, 2021
@at-wat
Fix python3 rosdep
3db3107 
Mistake in conflict resolve in #89
@at-wat at-wat mentioned this pull request Dec 24, 2021
Merged
at-wat added a commit that referenced this pull request Dec 24, 2021
@at-wat
Fix python3 rosdep
b238bb6 
Mistake in conflict resolve in #89
at-wat added a commit that referenced this pull request Dec 24, 2021
@at-wat
Fix python3 rosdep (#91)
6103cc1 
Mistake in conflict resolve in #89
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@f-fl0 f-fl0 f-fl0 approved these changes

Assignees

@at-wat at-wat

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.