From d7018a2ba0565c303ce133a0088ccd8d1ac85e3c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 8 Dec 2019 07:44:14 +1100 Subject: [PATCH] Tools: switch to https URL for firmware --- Tools/autotest/common.py | 2 +- Tools/autotest/web-firmware/index.html | 2 +- Tools/debug/README.md | 2 +- Tools/environment_install/install-prereqs-arch.sh | 2 +- Tools/environment_install/install-prereqs-ubuntu.sh | 2 +- .../install-prereqs-windows-andAPMSource.ps1 | 2 +- Tools/environment_install/install-prereqs-windows.ps1 | 2 +- Tools/scripts/build_binaries.py | 2 +- Tools/scripts/configure-ci.sh | 4 ++-- Tools/scripts/generate_manifest.py | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 1981ecdefd..38bfec28b1 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -641,7 +641,7 @@ class AutoTest(ABC): flist = glob.glob("logs/*.BIN") for e in ['BIN', 'bin', 'tlog']: flist += glob.glob(os.path.join(logdir, '*.%s' % e)) - print("Uploading %u logs to http://firmware.ardupilot.org/CI-Logs/%s" % (len(flist), datedir)) + print("Uploading %u logs to https://firmware.ardupilot.org/CI-Logs/%s" % (len(flist), datedir)) cmd = ['rsync', '-avz'] + flist + ['cilogs@autotest.ardupilot.org::CI-Logs/%s/' % datedir] subprocess.call(cmd) diff --git a/Tools/autotest/web-firmware/index.html b/Tools/autotest/web-firmware/index.html index 2984c52e55..e193a89aea 100644 --- a/Tools/autotest/web-firmware/index.html +++ b/Tools/autotest/web-firmware/index.html @@ -9,7 +9,7 @@
- + diff --git a/Tools/debug/README.md b/Tools/debug/README.md index a1385e2fd8..117f69900d 100644 --- a/Tools/debug/README.md +++ b/Tools/debug/README.md @@ -23,7 +23,7 @@ that the probe will be loaded as /dev/ttyBmpGdb Now make sure you have the right version of arm-none-eabi-gdb installed. We recommend version 6-2017-q2-update, which is available -here: http://firmware.ardupilot.org/Tools/STM32-tools/ +here: https://firmware.ardupilot.org/Tools/STM32-tools/ Now build ArduPilot with the --debug configure option. You may also like to include the --enable-asserts. Enabling asserts will slow down diff --git a/Tools/environment_install/install-prereqs-arch.sh b/Tools/environment_install/install-prereqs-arch.sh index f277076976..7d4efdd566 100755 --- a/Tools/environment_install/install-prereqs-arch.sh +++ b/Tools/environment_install/install-prereqs-arch.sh @@ -16,7 +16,7 @@ PYTHON3_PKGS="pyserial empy" # (see https://launchpad.net/gcc-arm-embedded/) ARM_ROOT="gcc-arm-none-eabi-6-2017-q2-update" ARM_TARBALL="$ARM_ROOT-linux.tar.bz2" -ARM_TARBALL_URL="http://firmware.ardupilot.org/Tools/STM32-tools/$ARM_TARBALL" +ARM_TARBALL_URL="https://firmware.ardupilot.org/Tools/STM32-tools/$ARM_TARBALL" # Ardupilot Tools ARDUPILOT_TOOLS="ardupilot/Tools/autotest" diff --git a/Tools/environment_install/install-prereqs-ubuntu.sh b/Tools/environment_install/install-prereqs-ubuntu.sh index e2698c60b8..f65828c5e3 100755 --- a/Tools/environment_install/install-prereqs-ubuntu.sh +++ b/Tools/environment_install/install-prereqs-ubuntu.sh @@ -31,7 +31,7 @@ fi # (see https://launchpad.net/gcc-arm-embedded/) ARM_ROOT="gcc-arm-none-eabi-6-2017-q2-update" ARM_TARBALL="$ARM_ROOT-linux.tar.bz2" -ARM_TARBALL_URL="http://firmware.ardupilot.org/Tools/STM32-tools/$ARM_TARBALL" +ARM_TARBALL_URL="https://firmware.ardupilot.org/Tools/STM32-tools/$ARM_TARBALL" # Ardupilot Tools ARDUPILOT_TOOLS="Tools/autotest" diff --git a/Tools/environment_install/install-prereqs-windows-andAPMSource.ps1 b/Tools/environment_install/install-prereqs-windows-andAPMSource.ps1 index 7c1bf8df6c..b857ce2ef3 100644 --- a/Tools/environment_install/install-prereqs-windows-andAPMSource.ps1 +++ b/Tools/environment_install/install-prereqs-windows-andAPMSource.ps1 @@ -5,7 +5,7 @@ Import-Module BitsTransfer Write-Output "Starting Downloads" Write-Output "Downloading MAVProxy (1/6)" -Start-BitsTransfer -Source "http://firmware.ardupilot.org/Tools/MAVProxy/MAVProxySetup-latest.exe" -Destination "$PSScriptRoot\MAVProxySetup-latest.exe" +Start-BitsTransfer -Source "https://firmware.ardupilot.org/Tools/MAVProxy/MAVProxySetup-latest.exe" -Destination "$PSScriptRoot\MAVProxySetup-latest.exe" Write-Output "Downloading Cygwin x64 (2/6)" Start-BitsTransfer -Source "https://cygwin.com/setup-x86_64.exe" -Destination "$PSScriptRoot\setup-x86_64.exe" diff --git a/Tools/environment_install/install-prereqs-windows.ps1 b/Tools/environment_install/install-prereqs-windows.ps1 index 2e3fd646a3..52f81bb114 100644 --- a/Tools/environment_install/install-prereqs-windows.ps1 +++ b/Tools/environment_install/install-prereqs-windows.ps1 @@ -5,7 +5,7 @@ Import-Module BitsTransfer Write-Output "Starting Downloads" Write-Output "Downloading MAVProxy (1/5)" -Start-BitsTransfer -Source "http://firmware.ardupilot.org/Tools/MAVProxy/MAVProxySetup-latest.exe" -Destination "$PSScriptRoot\MAVProxySetup-latest.exe" +Start-BitsTransfer -Source "https://firmware.ardupilot.org/Tools/MAVProxy/MAVProxySetup-latest.exe" -Destination "$PSScriptRoot\MAVProxySetup-latest.exe" Write-Output "Downloading Cygwin x64 (2/5)" Start-BitsTransfer -Source "https://cygwin.com/setup-x86_64.exe" -Destination "$PSScriptRoot\setup-x86_64.exe" diff --git a/Tools/scripts/build_binaries.py b/Tools/scripts/build_binaries.py index afba136cf7..de394d5b76 100755 --- a/Tools/scripts/build_binaries.py +++ b/Tools/scripts/build_binaries.py @@ -658,7 +658,7 @@ is bob we will attempt to checkout bob-AVR''' def generate_manifest(self): '''generate manigest files for GCS to download''' self.progress("Generating manifest") - base_url = 'http://firmware.ardupilot.org' + base_url = 'https://firmware.ardupilot.org' generator = generate_manifest.ManifestGenerator(self.binaries, base_url) content = generator.json() diff --git a/Tools/scripts/configure-ci.sh b/Tools/scripts/configure-ci.sh index bd3e64e622..47c5159210 100755 --- a/Tools/scripts/configure-ci.sh +++ b/Tools/scripts/configure-ci.sh @@ -21,14 +21,14 @@ pushd $HOME # PX4 toolchain dir=$ARM_ROOT if [ ! -d "$HOME/opt/$dir" -o ! -x "$HOME/opt/$dir/bin/arm-none-eabi-g++" ]; then - wget http://firmware.ardupilot.org/Tools/STM32-tools/$ARM_TARBALL + wget https://firmware.ardupilot.org/Tools/STM32-tools/$ARM_TARBALL tar -xf $ARM_TARBALL -C opt fi # RPi/BBB toolchain dir="tools-master/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64" if [ ! -d "$HOME/opt/$dir" -o ! -x "$HOME/opt/$dir/bin/arm-linux-gnueabihf-g++" ]; then - wget http://firmware.ardupilot.org/Tools/Travis/NavIO/$RPI_TARBALL + wget https://firmware.ardupilot.org/Tools/Travis/NavIO/$RPI_TARBALL tar -xf $RPI_TARBALL -C opt $dir fi diff --git a/Tools/scripts/generate_manifest.py b/Tools/scripts/generate_manifest.py index 98187d98bb..cbbf811fc2 100755 --- a/Tools/scripts/generate_manifest.py +++ b/Tools/scripts/generate_manifest.py @@ -481,7 +481,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description='generate manifest.json') parser.add_argument('--outfile', type=str, default=None, help='output file, default stdout') - parser.add_argument('--baseurl', type=str, default="http://firmware.ardupilot.org", help='base binaries directory') + parser.add_argument('--baseurl', type=str, default="https://firmware.ardupilot.org", help='base binaries directory') parser.add_argument('basedir', type=str, default="-", help='base binaries directory') args = parser.parse_args()