Skip to content

Commit e2a2746

Browse files
author
Murilo Marinho
committed
Fixing architecture
1 parent 3d55ec2 commit e2a2746

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.devel/build_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
docker buildx build -t sas_deb_builder --platform=linux/amd64 sas_deb_builder
2+
docker buildx build -t sas_deb_builder sas_deb_builder

.devel/build_ros2.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rosv="jazzy"
1414
# Ubuntu version
1515
ubuntuv="noble"
1616
# Architecture
17-
archname="amd64"
17+
arch=$(uname -i)
1818

1919
PRE_BUILD() {
2020
# Remove the debian folder just in case. In ROS1 and catkin this was an issue
@@ -121,6 +121,6 @@ for pkg_name in "${pkg_array[@]}"; do
121121
cd ..
122122
# Install package but replace _ by -. E.g. sas_core becomes sas-core.
123123
# https://stackoverflow.com/questions/3306007/replace-a-string-in-shell-script-using-a-variable
124-
sudo dpkg -i ros-"$rosv"-"${pkg_name//_/-}"_*"$ubuntuv"_"$archname".deb
124+
sudo dpkg -i ros-"$rosv"-"${pkg_name//_/-}"_*"$ubuntuv"_"$arch".deb
125125
${var//12345678/$replace}
126126
done
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
# Copyright (c) Murilo M. Marinho (www.murilomarinho.info)
3+
4+
docker cp <containerId>:/file/path/within/container /host/path/target

.devel/run_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Based on juanjqo's https://github.com/Adorno-Lab/docker_recipes/blob/main/run_container.sh
44

55
docker run -it --name=sas_deb_builder \
6-
--rm --privileged --network=host --env=DISPLAY --platform=linux/amd64 \
6+
--rm --privileged --network=host --env=DISPLAY \
77
sas_deb_builder /bin/bash

0 commit comments

Comments
 (0)