Skip to content

Commit

Permalink
Update install instructions, especially for 20.04 targets (nasa#753)
Browse files Browse the repository at this point in the history
* Fix typos in `INSTALL.md` and `NASA_INSTALL.md`

* Update cross-compile toolchain and chroot setup instructions for 20.04
  • Loading branch information
Bckempa authored Nov 13, 2023
1 parent 39a4e71 commit 30e3f71
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion doc/general_documentation/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ instead:

./src/scripts/configure.sh -l -F -D -p $INSTALL_PATH -w $WORKSPACE_PATH

*Note: If a workspace is specified but not an explicit install distectory,
*Note: If a workspace is specified but not an explicit install directory,
install location will be $WORKSPACE_PATH/install.*

*Note: Make sure you use the -F and -D flags. If these flags are not used, the
Expand Down
21 changes: 14 additions & 7 deletions doc/general_documentation/NASA_INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ your life greatly.
Verify that you are in this situation with the command below should succeed
(certificate will be added later; remove the Release.gpg file after being fetched).

wget -v --no-check-certificate http://astrobee.ndc.nasa.gov/software/dists/xenial/Release.gpg
wget -v --no-check-certificate https://astrobee.ndc.nasa.gov/software_new/dists/focal/Release.gpg

Before running the scripts in `scripts/setup` below, set this variable:

Expand Down Expand Up @@ -155,7 +155,7 @@ instead:

./scripts/configure.sh -l -p $INSTALL_PATH -w $WORKSPACE_PATH

*Note: If a workspace is specified but not an explicit install distectory,
*Note: If a workspace is specified but not an explicit install directory,
install location will be $WORKSPACE_PATH/install.*


Expand Down Expand Up @@ -183,7 +183,7 @@ For more information on running the simulator and moving the robot, please see t

## Cross-compile - Running the code on a real robot

In order to do this, you will need to followe the cross-compile build
In order to do this, you will need to follow the cross-compile build
instructions.

### Cross-compile setup
Expand All @@ -202,11 +202,18 @@ Next, download the cross toolchain and install the chroot:

mkdir -p $ARMHF_TOOLCHAIN
cd $HOME/arm_cross
$ASTROBEE_WS/src/submodules/platform/fetch_toolchain.sh
$ASTROBEE_WS/src/submodules/platform/rootfs/make_chroot.sh xenial dev $ARMHF_CHROOT_DIR

*Note: The last script shown above needs the packages `qemu-user-static` (not
`qemu-arm-static`) and `multistrap` to be installed (can be installed through apt).*
DIST=$(. /etc/os-release && echo $UBUNTU_CODENAME)
if [ ${DIST} == "kinetic" ]; then
# Use pre-built toolchain for 16.04
$ASTROBEE_WS/src/submodules/platform/fetch_toolchain.sh
else
# Use packaged toolchain for 20.04
sudo apt install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
fi
sudo apt install -y qemu-user-static multistrap

$ASTROBEE_WS/src/submodules/platform/rootfs/make_chroot.sh ${DIST} dev $ARMHF_CHROOT_DIR

### Cross-compile build

Expand Down

0 comments on commit 30e3f71

Please sign in to comment.