Remove ros2 repository

Install rosdep and colcon from pypi instead of apt

Author: rhaschke

src/README.md.in

@@ -3,10 +3,6 @@
 ## Install
 
 ```bash
-# Configure ROS 2 apt repository
-sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /etc/apt/keyrings/ros-archive-keyring.gpg
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list
-
 # Configure custom ROS repository
 echo "deb [trusted=yes] @REPO_URL@ ./" | sudo tee /etc/apt/sources.list.d/@DISTRO_NAME@.list
 

src/prepare.sh

@@ -88,10 +88,11 @@ function create_chroot {
 
 
   local tmp; tmp=$(mktemp "/tmp/ros-builder-XXXXXX.sh")
+  # shellcheck disable=SC2001
   cat <<- EOF > "$tmp"
+  set -x  # bash debug mode
   mkdir -p /etc/apt/keyrings
-  curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /etc/apt/keyrings/ros-archive-keyring.gpg
-  $INSTALL_GPG_KEYS
+  $(echo "$INSTALL_GPG_KEYS" | sed 's/sudo //')
   echo "Acquire::http::Proxy \"http://127.0.0.1:3142\";" > tee /etc/apt/apt.conf.d/01acng
 EOF
 
@@ -104,13 +105,12 @@ EOF
   local chroot_folder="/var/cache/sbuild-chroot"
   # shellcheck disable=SC2016
   ici_cmd ici_asroot mmdebstrap \
-    --variant=buildd --include=apt,apt-utils,ccache,ca-certificates,curl,build-essential,debhelper,fakeroot,cmake,git,python3-rosdep,python3-catkin-pkg \
+    --variant=buildd --include=apt,apt-utils,ccache,ca-certificates,curl,build-essential,debhelper,fakeroot,cmake,git \
     --customize-hook="upload $tmp $tmp" \
     --customize-hook="chroot \$1 chmod 755 $tmp" \
     --customize-hook="chroot \$1 sh -c $tmp" \
     "$DEB_DISTRO" "$chroot_folder" \
-    "deb $DISTRIBUTION_REPO $DEB_DISTRO main universe" \
-    "deb [signed-by=/etc/apt/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $DEB_DISTRO main"
+    "deb $DISTRIBUTION_REPO $DEB_DISTRO main universe"
 
   ici_log
   ici_color_output BOLD "Write schroot config"

src/scripts/prepare.sh

@@ -14,11 +14,6 @@ ici_append INSTALL_HOST_GPG_KEYS "sudo apt-key adv --keyserver keyserver.ubuntu.
 ici_append EXTRA_HOST_SOURCES "deb http://ppa.launchpad.net/v-launchpad-jochen-sprickerhof-de/sbuild/ubuntu jammy main"
 ici_cmd restrict_src_to_packages "release o=v-launchpad-jochen-sprickerhof-de" "mmdebstrap sbuild"
 
-# ROS for python3-rosdep, python3-colcon-*
-ros_key_file="/etc/apt/keyrings/ros-archive-keyring.gpg"
-ici_append INSTALL_HOST_GPG_KEYS "sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o $ros_key_file"
-ici_append EXTRA_HOST_SOURCES "deb [signed-by=$ros_key_file] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main"
-
 # Configure sources
 ici_hook INSTALL_HOST_GPG_KEYS
 ici_timed "Configure EXTRA_HOST_SOURCES" configure_extra_host_sources
@@ -30,8 +25,7 @@ echo apt-cacher-ng apt-cacher-ng/tunnelenable boolean true | ici_asroot debconf-
 
 # Install packages on host
 DEBIAN_FRONTEND=noninteractive ici_timed "Install build packages" ici_cmd "${APT_QUIET[@]}" ici_apt_install \
-	mmdebstrap sbuild schroot devscripts ccache apt-cacher-ng python3-pip python3-rosdep libxml2-utils libarchive-tools \
-	python3-colcon-package-information python3-colcon-package-selection python3-colcon-ros python3-colcon-cmake \
+	mmdebstrap sbuild schroot devscripts ccache apt-cacher-ng python3-pip libxml2-utils libarchive-tools \
 	debhelper python3-all dh-python build-essential
 
 export PIP_BREAK_SYSTEM_PACKAGES=1
@@ -41,11 +35,8 @@ ici_timed "Install bloom" ici_asroot pip install -U git+https://github.com/rhasc
 ici_timed "Install vcstool" ici_asroot pip install -U git+https://github.com/rhaschke/vcstool.git@master
 # Install latest stdeb
 ici_timed "Install stdeb" ici_asroot pip install -U git+https://github.com/astraw/stdeb@master
-
-# Remove ros2 package repository, now that rosdep and colcon are installed
-# This repo might have newer versions, e.g. of colcon, than the ones to be built
-ici_asroot sed -i '/packages.ros.org\/ros2\/ubuntu/d' "$REPOS_LIST_FILE"
-ici_timed "Update apt package list" ici_asroot apt-get update
+# Install colcon and rosdep from pypi
+ici_timed "Install rosdep and colcon" ici_asroot pip install -U rosdep colcon-package-information colcon-package-selection colcon-ros colcon-cmake
 
 # remove existing rosdep config to avoid conflicts with rosdep init
 ici_asroot rm -f /etc/ros/rosdep/sources.list.d/20-default.list