Read about our upcoming Code of Conduct on this issue

Commit 7861480e authored by alex@thinkpad's avatar alex@thinkpad
Browse files

QEMU install.sh: further Ubuntu/WSL cleanups (minor)

--HG--
branch : qemu
parent 351a3adc4971
......@@ -123,14 +123,15 @@ if [ -n "$(lsb_release -i | grep Ubuntu)" ]; then
echo "*** You have a few options:"
echo
# 32-bit binaries not working under WSL - hide these options
# fixme: hidden options can still be selected
if [ -z "$(uname -a | grep Microsoft)" ]; then
echo "1 - Install gdb-arm-none-eabi:i386 and gcc-arm-none-eabi from Ubuntu repo (recommended)"
echo " This will install 32-bit binaries - will not work under Windows Subsystem for Linux."
echo " This will install 32-bit binaries."
echo
echo "2 - Download a 32-bit gcc-arm-embedded and install it without the package manager."
echo " Will be installed in your home directory; to move it, you must edit the Makefiles."
echo " This will install 32-bit binaries - will not work under Windows Subsystem for Linux."
echo " This will install 32-bit binaries."
echo
if dpkg -l binutils-arm-none-eabi 2>/dev/null | grep -q '^.i'; then
echo "3 - Remove Ubuntu toolchain and install the one from gcc-arm-embedded PPA (gcc 6.x)"
......@@ -143,19 +144,20 @@ if [ -n "$(lsb_release -i | grep Ubuntu)" ]; then
fi
echo " - sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa"
echo " - install the gcc-arm-embedded:i386 package."
echo " This will install 32-bit binaries - will not work under Windows Subsystem for Linux."
echo " This will install 32-bit binaries."
echo
else
echo "1-3: options not available on Windows 10 WSL (32-bit binaries)."
fi
echo "4 - Install gdb-arm-none-eabi and gcc-arm-none-eabi from Ubuntu repository (64-bit)"
echo " WARNING: this will not be able to run all our GDB scripts."
echo
echo "5 - Manually install arm-none-eabi-gdb from https://launchpad.net/gcc-arm-embedded"
echo " or any other source, make sure it is in PATH, then run this script again."
echo
if ! arm-none-eabi-gdb -v &> /dev/null; then
echo
else
echo
if arm-none-eabi-gdb -v &> /dev/null; then
echo "6 - Just use the current 64-bit toolchain."
echo " WARNING: this will not be able to run all our GDB scripts."
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment