diff options
author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-12-22 14:52:32 +1100 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-12-22 14:52:32 +1100 |
commit | c249da16053b8409e7aae4bb963e52354de01dc2 (patch) | |
tree | f0bd0608fbe26f58d502680a2cae7ee77414c838 | |
parent | 2e585cadb968853abe684156b5ab5a425f61f65d (diff) | |
download | skiboot-c249da16053b8409e7aae4bb963e52354de01dc2.zip skiboot-c249da16053b8409e7aae4bb963e52354de01dc2.tar.gz skiboot-c249da16053b8409e7aae4bb963e52354de01dc2.tar.bz2 |
travis: use curl rather than wget
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r-- | opal-ci/Dockerfile-centos6 | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-centos7 | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-fedora-rawhide | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-fedora24 | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-12.04 | 6 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-16.04 | 4 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-latest | 4 | ||||
-rwxr-xr-x | opal-ci/fetch-debian-jessie-installer.sh | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/opal-ci/Dockerfile-centos6 b/opal-ci/Dockerfile-centos6 index d4cf436..d76f1be 100644 --- a/opal-ci/Dockerfile-centos6 +++ b/opal-ci/Dockerfile-centos6 @@ -1,6 +1,6 @@ FROM centos:6 RUN yum -y update && yum clean all -RUN yum -y install wget xterm gcc git xz ccache +RUN yum -y install wget curl xterm gcc git xz ccache RUN wget https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz RUN mkdir /opt/cross RUN tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7 index 47e9138..9c96bf0 100644 --- a/opal-ci/Dockerfile-centos7 +++ b/opal-ci/Dockerfile-centos7 @@ -1,6 +1,6 @@ FROM centos:7 RUN yum -y update && yum clean all -RUN yum -y install wget xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache +RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache RUN wget https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz RUN mkdir /opt/cross RUN tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide index d02ee0c..eac84b7 100644 --- a/opal-ci/Dockerfile-fedora-rawhide +++ b/opal-ci/Dockerfile-fedora-rawhide @@ -1,5 +1,5 @@ FROM fedora:rawhide -RUN dnf -y install wget xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache +RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache RUN dnf -y install gcc-powerpc64-linux-gnu COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-fedora24 b/opal-ci/Dockerfile-fedora24 index d92affd..83d31be 100644 --- a/opal-ci/Dockerfile-fedora24 +++ b/opal-ci/Dockerfile-fedora24 @@ -1,5 +1,5 @@ FROM fedora:24 -RUN dnf -y install wget xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache +RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache RUN dnf -y install gcc-powerpc64-linux-gnu COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-ubuntu-12.04 b/opal-ci/Dockerfile-ubuntu-12.04 index fd7bd09..ff9c359 100644 --- a/opal-ci/Dockerfile-ubuntu-12.04 +++ b/opal-ci/Dockerfile-ubuntu-12.04 @@ -6,11 +6,11 @@ RUN sudo apt-get update -qq RUN sudo apt-get install -y gcc-4.8 libstdc++6 valgrind expect xterm ccache RUN sudo apt-get install -y gcc-arm-linux-gnueabi gcc-powerpc64le-linux-gnu gcc RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 -RUN sudo apt-get install -y wget -RUN wget https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz +RUN sudo apt-get install -y wget curl +RUN curl -O https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz RUN sudo mkdir /opt/cross RUN sudo tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz -RUN wget ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb +RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb RUN sudo dpkg -i systemsim-p8_1.0-2_amd64.deb RUN sudo apt-get -y install eatmydata RUN sudo eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 diff --git a/opal-ci/Dockerfile-ubuntu-16.04 b/opal-ci/Dockerfile-ubuntu-16.04 index 8dea58d..2ed83cd 100644 --- a/opal-ci/Dockerfile-ubuntu-16.04 +++ b/opal-ci/Dockerfile-ubuntu-16.04 @@ -1,9 +1,9 @@ FROM ubuntu:16.04 RUN apt-get update -qq RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache -RUN apt-get install -y wget xterm +RUN apt-get install -y wget curl xterm RUN apt-get install -y gcc-arm-linux-gnueabi -RUN wget ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb +RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb RUN dpkg -i systemsim-p8_1.0-2_amd64.deb RUN apt-get -y install eatmydata RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest index 683a5a1..fde86ec 100644 --- a/opal-ci/Dockerfile-ubuntu-latest +++ b/opal-ci/Dockerfile-ubuntu-latest @@ -1,9 +1,9 @@ FROM ubuntu:latest RUN apt-get update -qq RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache -RUN apt-get install -y wget xterm +RUN apt-get install -y wget xterm curl RUN apt-get install -y gcc-arm-linux-gnueabi -RUN wget ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb +RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb RUN dpkg -i systemsim-p8_1.0-2_amd64.deb RUN apt-get -y install eatmydata RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind diff --git a/opal-ci/fetch-debian-jessie-installer.sh b/opal-ci/fetch-debian-jessie-installer.sh index 6140ebd..243e649 100755 --- a/opal-ci/fetch-debian-jessie-installer.sh +++ b/opal-ci/fetch-debian-jessie-installer.sh @@ -1,3 +1,3 @@ #!/bin/bash -wget http://ftp.debian.org/debian/dists/jessie/main/installer-ppc64el/current/images/netboot/debian-installer/ppc64el/vmlinux -O debian-jessie-vmlinux -wget http://ftp.debian.org/debian/dists/jessie/main/installer-ppc64el/current/images/netboot/debian-installer/ppc64el/initrd.gz -O debian-jessie-initrd.gz +curl http://ftp.debian.org/debian/dists/jessie/main/installer-ppc64el/current/images/netboot/debian-installer/ppc64el/vmlinux -o debian-jessie-vmlinux +curl http://ftp.debian.org/debian/dists/jessie/main/installer-ppc64el/current/images/netboot/debian-installer/ppc64el/initrd.gz -o debian-jessie-initrd.gz |