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.

Sign up for GitHub

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

fix to pass packages with catkin_virtualenv #3

Open
wants to merge 6 commits into
base: roso-noble
Choose a base branch
from
Open

fix to pass packages with catkin_virtualenv #3

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3cb377
build.sh : skip dh_shlibdeps, because some pip modules, speech_recogn…
k-okada Dec 29, 2024
b3bab5c
'mkdir /sbuild-nonexistent/.ros/log' to resolve ros-o-builder error w…
k-okada Dec 30, 2024
7bb7eb3
add ppa:k-okada/python3-catkin-tools for jammy
k-okada Jan 2, 2025
28b8a36
skip dh_strip error to ignore --compress-debug-sections error
k-okada Jan 6, 2025
ecc7df2
fix when multiple repository is defined in DEB_REPOSITORY, --extra-re…
k-okada Jan 7, 2025
13da65f
add ppa:v-launchpad-jochen-sprickerhof-de/ros for 22.04
k-okada Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ case $ROS_DISTRO in
;;
esac

EXTRA_SBUILD_OPTS="$EXTRA_SBUILD_OPTS $(echo $DEB_REPOSITORY | sed -n '/^ *$/ T; s/.*/--extra-repository="\0"/; p' | tr '\n' ' ')"
EXTRA_SBUILD_OPTS="$EXTRA_SBUILD_OPTS $(/usr/bin/echo -e "$DEB_REPOSITORY" | sed -n '/^ *$/ T; s/^ *\(.*\)/--extra-repository="\1"/; p' | tr '\n' ' ')"

# jammy does not have python3-catkin-tools (noble has catkin-tools)
curl -sSL 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xcad670483add74b8c77e4512c3263a3eba4c7747' -o /home/runner/ppa-k-okada-keyring.gpg
EXTRA_SBUILD_OPTS="$EXTRA_SBUILD_OPTS --extra-repository='deb https://ppa.launchpadcontent.net/k-okada/python3-catkin-tools/ubuntu $DEB_DISTRO main' --extra-repository-key=/home/runner/ppa-k-okada-keyring.gpg"

# make output directory
REPO_DEPENDENCIES=/home/runner/apt_repo_dependencies
Expand Down Expand Up @@ -148,6 +152,10 @@ build_deb(){
# all use the "debian" term, but we want this distribution to be called "one" instead
sed -i 's@ros-debian-@ros-one-@' $(grep -rl 'ros-debian-' debian/)
sed -i 's@/opt/ros/debian@/opt/ros/one@g' debian/rules
# skip dh_shlibdeps, because some pip modules, speech_recognition for example, contains x86/x86_64/win32/mac binaries
sed -i '/dh_shlibdeps / s@$@ || echo "Skip dh_shlibdeps error!!!"@' debian/rules
# ignore dh_strip error, from jammy, 'objcopy' added '--compress-debug-sections' and this cause error on 'numpy/core/_multiarray_umath.cpython-310-x86_64-linux-gnu.so has a corrupt string table index - ignoring'
echo -e 'override_dh_strip:\n dh_strip || true\n' |tee -a debian/rules
Comment on lines +156 to +158
Copy link

Choose a reason for hiding this comment

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

The tab string was not correctly inserted in my environment

printf 'override_dh_strip:\n\t%s\n' 'dh_strip || true' | tee -a debian/rules

worked in jsk-ros-pkg/jsk_3rdparty#519 case


sed -i "1 s@([^)]*)@($pkg_version)@" debian/changelog

Expand All @@ -157,6 +165,10 @@ build_deb(){
SBUILD_OPTS="--chroot-mode=unshare --no-clean-source --no-run-lintian \
--dpkg-source-opts=\"-Zgzip -z1 --format=1.0 -sn\" --build-dir=$REPO --extra-package=$REPO \
$EXTRA_SBUILD_OPTS"

# create logger directgory for venv
SBUILD_OPTS="$SBUILD_OPTS --chroot-setup-commands='mkdir -p /sbuild-nonexistent/.ros/log/; chmod a+rw -R /sbuild-nonexistent/'"

# dpkg-source-opts: no need for upstream.tar.gz
eval sbuild $SBUILD_OPTS
sbuild_success=$?
Expand Down