From 5493445747a236b1d282543c2df69ceeb5fc24c7 Mon Sep 17 00:00:00 2001
From: Oleg Kalachev <okalachev@gmail.com>
Date: Fri, 23 Sep 2022 03:04:30 +0300
Subject: [PATCH] Manually install catkin_pkg

---
 builder/image-build-ros.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/builder/image-build-ros.sh b/builder/image-build-ros.sh
index 7fa61f59..40c11852 100755
--- a/builder/image-build-ros.sh
+++ b/builder/image-build-ros.sh
@@ -22,9 +22,9 @@ export ROS_OS_OVERRIDE=debian:$VERSION_CODENAME
 
 echo "=== Building ROS from scratch"
 
-echo "--- Adding sources"
-echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list
-curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
+#echo "--- Adding sources"
+#echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list
+#curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
 
 apt-get update
 apt-get install -y python3-distutils python3-rosdep python3-rosinstall-generator build-essential # python3-vcstool
@@ -51,10 +51,17 @@ mkdir ./src
 vcs import --input noetic.rosinstall ./src
 
 # https://answers.ros.org/question/343367/catkin-package-dependencies-issue-when-installing-ros-melodic-on-raspberry-pi-4/
-sudo apt remove python-rospkg
-sudo apt remove python-catkin-pkg
-#sudo apt --fix-broken install
-sudo apt-get autoremove
+#sudo apt remove python-rospkg
+#sudo apt remove python-catkin-pkg
+##sudo apt --fix-broken install
+#sudo apt-get autoremove
+
+echo "--- Install catkin_pkg"
+cd
+https://github.com/ros-infrastructure/catkin_pkg.git
+cd catkin_pkg
+python3 setup.py install
+cd ~/ros_catkin_ws
 
 echo "--- Resolve dependencies"
 rosdep install --from-paths ./src --ignore-packages-from-source --rosdistro $ROS_DISTRO -y --os=debian:$VERSION_CODENAME