From d5f02538cdd34576b9ffa2453f3dc56d5715420f Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Tue, 23 May 2023 14:03:34 -0300 Subject: [PATCH 1/5] tests: remove arch_triplet from unit test (#4160) (#4172) Signed-off-by: Callahan Kovacs Co-authored-by: Callahan --- tests/unit/meta/test_snap_yaml.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/unit/meta/test_snap_yaml.py b/tests/unit/meta/test_snap_yaml.py index 5282046905..d04a8cd408 100644 --- a/tests/unit/meta/test_snap_yaml.py +++ b/tests/unit/meta/test_snap_yaml.py @@ -96,7 +96,6 @@ def test_assumes(simple_project, new_dir): simple_project(assumes=["foossumes"]), prime_dir=Path(new_dir), arch="amd64", - arch_triplet="x86_64-linux-gnu", ) yaml_file = Path("meta/snap.yaml") assert yaml_file.is_file() @@ -425,7 +424,6 @@ def test_hook_command_chain_assumes_with_existing_assumes(simple_project, new_di simple_project(hooks=hooks, assumes=["foossumes", "barssumes"]), prime_dir=Path(new_dir), arch="amd64", - arch_triplet="x86_64-linux-gnu", ) yaml_file = Path("meta/snap.yaml") assert yaml_file.is_file() From 95e88a1c1a028a8c9fa21e8b3f2bb9d3e27fe2f7 Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Tue, 23 May 2023 17:43:51 -0400 Subject: [PATCH 2/5] snap: use rustup on risc-v (#4163) Co-authored-by: Sergio Schvezov --- snap/snapcraft.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 38c9907f82..4422c6607d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -44,6 +44,12 @@ parts: build-packages: - cargo - rustc + - curl + override-pull: | + # RISC-V doesn't have a new enough rust (>=1.48) on focal. + if [[ "${SNAPCRAFT_TARGET_ARCH}" = "riscv64" ]]; then + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal + fi bash-completion: source: debian @@ -132,6 +138,7 @@ parts: - "PIP_NO_BINARY": "PyNaCl" # Build PyNaCl from source since the wheel files interact strangely with classic snaps. - "SODIUM_INSTALL": "system" # Use base image's libsodium for PyNaCl - "CFLAGS": "$(pkg-config python-3.8 yaml-0.1 --cflags)" + - "PATH": "${HOME}/.cargo/bin:${PATH}" override-build: | snapcraftctl build From f0f5fca3a854d1e337cb9b6eeee9e7c99024895e Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Tue, 23 May 2023 20:21:20 -0300 Subject: [PATCH 3/5] requirements: update craft-parts to 1.19.5 (#4173) Craft Parts 1.19.5 fixes subdir in pull and build steps. Signed-off-by: Claudio Matsuoka --- requirements-devel.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index ff31914926..3afae65bfe 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -14,7 +14,7 @@ coverage==7.2.5 craft-archives==0.0.3 craft-cli==1.2.0 craft-grammar==1.1.1 -craft-parts==1.19.3 +craft-parts==1.19.5 craft-providers==1.10.0 craft-store==2.4.0 cryptography==40.0.2 diff --git a/requirements.txt b/requirements.txt index 627a8cc899..dece2a3db8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ click==8.1.3 craft-archives==0.0.3 craft-cli==1.2.0 craft-grammar==1.1.1 -craft-parts==1.19.3 +craft-parts==1.19.5 craft-providers==1.10.0 craft-store==2.4.0 cryptography==40.0.2 From 673e5ca533226c89a651f8ae766534a1d2e7bc41 Mon Sep 17 00:00:00 2001 From: Guillaume Beuzeboc Date: Wed, 31 May 2023 19:21:16 +0200 Subject: [PATCH 4/5] spread: change expected output for ros test (#4184) The expected output changed with a new python library --- .../linter-ros2-humble-mixed/expected_linter_output.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/spread/core22/linters/linter-ros2-humble-mixed/expected_linter_output.txt b/tests/spread/core22/linters/linter-ros2-humble-mixed/expected_linter_output.txt index e5aff790af..2442be15bb 100644 --- a/tests/spread/core22/linters/linter-ros2-humble-mixed/expected_linter_output.txt +++ b/tests/spread/core22/linters/linter-ros2-humble-mixed/expected_linter_output.txt @@ -6,32 +6,39 @@ Lint warnings: - library: libexpat.so.1: unused library 'lib/x86_64-linux-gnu/libexpat.so.1.8.7'. (https://snapcraft.io/docs/linters-library) - library: libtirpc.so.3: unused library 'lib/x86_64-linux-gnu/libtirpc.so.3.0.0'. (https://snapcraft.io/docs/linters-library) - library: libz.so.1: unused library 'lib/x86_64-linux-gnu/libz.so.1.2.11'. (https://snapcraft.io/docs/linters-library) +- library: libaction_msgs__rosidl_generator_py.so: unused library 'opt/ros/humble/lib/libaction_msgs__rosidl_generator_py.so'. (https://snapcraft.io/docs/linters-library) - library: libaction_msgs__rosidl_typesupport_cpp.so: unused library 'opt/ros/humble/lib/libaction_msgs__rosidl_typesupport_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: libaction_msgs__rosidl_typesupport_fastrtps_c.so: unused library 'opt/ros/humble/lib/libaction_msgs__rosidl_typesupport_fastrtps_c.so'. (https://snapcraft.io/docs/linters-library) - library: libaction_msgs__rosidl_typesupport_fastrtps_cpp.so: unused library 'opt/ros/humble/lib/libaction_msgs__rosidl_typesupport_fastrtps_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: libaction_msgs__rosidl_typesupport_introspection_c.so: unused library 'opt/ros/humble/lib/libaction_msgs__rosidl_typesupport_introspection_c.so'. (https://snapcraft.io/docs/linters-library) - library: libaction_msgs__rosidl_typesupport_introspection_cpp.so: unused library 'opt/ros/humble/lib/libaction_msgs__rosidl_typesupport_introspection_cpp.so'. (https://snapcraft.io/docs/linters-library) +- library: libbuiltin_interfaces__rosidl_generator_py.so: unused library 'opt/ros/humble/lib/libbuiltin_interfaces__rosidl_generator_py.so'. (https://snapcraft.io/docs/linters-library) - library: libbuiltin_interfaces__rosidl_typesupport_cpp.so: unused library 'opt/ros/humble/lib/libbuiltin_interfaces__rosidl_typesupport_cpp.so'. (https://snapcraft.io/docs/linters-library) +- library: liblifecycle_msgs__rosidl_generator_py.so: unused library 'opt/ros/humble/lib/liblifecycle_msgs__rosidl_generator_py.so'. (https://snapcraft.io/docs/linters-library) - library: liblifecycle_msgs__rosidl_typesupport_cpp.so: unused library 'opt/ros/humble/lib/liblifecycle_msgs__rosidl_typesupport_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: liblifecycle_msgs__rosidl_typesupport_fastrtps_c.so: unused library 'opt/ros/humble/lib/liblifecycle_msgs__rosidl_typesupport_fastrtps_c.so'. (https://snapcraft.io/docs/linters-library) - library: liblifecycle_msgs__rosidl_typesupport_fastrtps_cpp.so: unused library 'opt/ros/humble/lib/liblifecycle_msgs__rosidl_typesupport_fastrtps_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: liblifecycle_msgs__rosidl_typesupport_introspection_c.so: unused library 'opt/ros/humble/lib/liblifecycle_msgs__rosidl_typesupport_introspection_c.so'. (https://snapcraft.io/docs/linters-library) - library: liblifecycle_msgs__rosidl_typesupport_introspection_cpp.so: unused library 'opt/ros/humble/lib/liblifecycle_msgs__rosidl_typesupport_introspection_cpp.so'. (https://snapcraft.io/docs/linters-library) +- library: librcl_interfaces__rosidl_generator_py.so: unused library 'opt/ros/humble/lib/librcl_interfaces__rosidl_generator_py.so'. (https://snapcraft.io/docs/linters-library) - library: librcl_interfaces__rosidl_typesupport_cpp.so: unused library 'opt/ros/humble/lib/librcl_interfaces__rosidl_typesupport_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: librcl_interfaces__rosidl_typesupport_fastrtps_c.so: unused library 'opt/ros/humble/lib/librcl_interfaces__rosidl_typesupport_fastrtps_c.so'. (https://snapcraft.io/docs/linters-library) - library: librcl_interfaces__rosidl_typesupport_fastrtps_cpp.so: unused library 'opt/ros/humble/lib/librcl_interfaces__rosidl_typesupport_fastrtps_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: librcl_interfaces__rosidl_typesupport_introspection_c.so: unused library 'opt/ros/humble/lib/librcl_interfaces__rosidl_typesupport_introspection_c.so'. (https://snapcraft.io/docs/linters-library) - library: librcl_interfaces__rosidl_typesupport_introspection_cpp.so: unused library 'opt/ros/humble/lib/librcl_interfaces__rosidl_typesupport_introspection_cpp.so'. (https://snapcraft.io/docs/linters-library) +- library: librmw_dds_common__rosidl_generator_py.so: unused library 'opt/ros/humble/lib/librmw_dds_common__rosidl_generator_py.so'. (https://snapcraft.io/docs/linters-library) - library: librmw_dds_common__rosidl_typesupport_fastrtps_c.so: unused library 'opt/ros/humble/lib/librmw_dds_common__rosidl_typesupport_fastrtps_c.so'. (https://snapcraft.io/docs/linters-library) - library: librmw_dds_common__rosidl_typesupport_fastrtps_cpp.so: unused library 'opt/ros/humble/lib/librmw_dds_common__rosidl_typesupport_fastrtps_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: librmw_dds_common__rosidl_typesupport_introspection_c.so: unused library 'opt/ros/humble/lib/librmw_dds_common__rosidl_typesupport_introspection_c.so'. (https://snapcraft.io/docs/linters-library) - library: librmw_dds_common__rosidl_typesupport_introspection_cpp.so: unused library 'opt/ros/humble/lib/librmw_dds_common__rosidl_typesupport_introspection_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: librmw_fastrtps_cpp.so: unused library 'opt/ros/humble/lib/librmw_fastrtps_cpp.so'. (https://snapcraft.io/docs/linters-library) +- library: librosgraph_msgs__rosidl_generator_py.so: unused library 'opt/ros/humble/lib/librosgraph_msgs__rosidl_generator_py.so'. (https://snapcraft.io/docs/linters-library) - library: librosgraph_msgs__rosidl_typesupport_cpp.so: unused library 'opt/ros/humble/lib/librosgraph_msgs__rosidl_typesupport_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: librosgraph_msgs__rosidl_typesupport_fastrtps_c.so: unused library 'opt/ros/humble/lib/librosgraph_msgs__rosidl_typesupport_fastrtps_c.so'. (https://snapcraft.io/docs/linters-library) - library: librosgraph_msgs__rosidl_typesupport_fastrtps_cpp.so: unused library 'opt/ros/humble/lib/librosgraph_msgs__rosidl_typesupport_fastrtps_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: librosgraph_msgs__rosidl_typesupport_introspection_c.so: unused library 'opt/ros/humble/lib/librosgraph_msgs__rosidl_typesupport_introspection_c.so'. (https://snapcraft.io/docs/linters-library) - library: librosgraph_msgs__rosidl_typesupport_introspection_cpp.so: unused library 'opt/ros/humble/lib/librosgraph_msgs__rosidl_typesupport_introspection_cpp.so'. (https://snapcraft.io/docs/linters-library) +- library: libunique_identifier_msgs__rosidl_generator_py.so: unused library 'opt/ros/humble/lib/libunique_identifier_msgs__rosidl_generator_py.so'. (https://snapcraft.io/docs/linters-library) - library: libunique_identifier_msgs__rosidl_typesupport_cpp.so: unused library 'opt/ros/humble/lib/libunique_identifier_msgs__rosidl_typesupport_cpp.so'. (https://snapcraft.io/docs/linters-library) - library: libatomic.so.1: unused library 'usr/lib/x86_64-linux-gnu/libatomic.so.1.2.0'. (https://snapcraft.io/docs/linters-library) - library: libicuio.so.70: unused library 'usr/lib/x86_64-linux-gnu/libicuio.so.70.1'. (https://snapcraft.io/docs/linters-library) From 4ca9c304434ede6fe2a4b2a23eafbc3a3443d90b Mon Sep 17 00:00:00 2001 From: gbeuzeboc Date: Thu, 25 May 2023 14:47:34 +0200 Subject: [PATCH 5/5] catkin plugin: add distro-info-data to build-packages The package distro-info-data is not available by default in LXD. This package is necessary for catkin. This enable core18 ros snap to be built with LXD (and remote-build). --- snapcraft_legacy/plugins/v1/catkin.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/snapcraft_legacy/plugins/v1/catkin.py b/snapcraft_legacy/plugins/v1/catkin.py index 4a3be2162b..73fe9de2e1 100644 --- a/snapcraft_legacy/plugins/v1/catkin.py +++ b/snapcraft_legacy/plugins/v1/catkin.py @@ -308,7 +308,16 @@ def __init__(self, name, options, project): base = self.project._get_build_base() self._rosdistro = _BASE_TO_ROS_RELEASE_MAP[base] - self.build_packages.extend(["gcc", "g++", "libc6-dev", "make", "python-pip"]) + self.build_packages.extend( + [ + "distro-info-data", + "gcc", + "g++", + "libc6-dev", + "make", + "python-pip", + ] + ) self.__pip = None # roslib is the base requiremet to actually create a workspace with