From patchwork Thu Dec 22 06:20:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 708155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tkhHF5N0qz9t0w for ; Thu, 22 Dec 2016 17:21:13 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tkhHF4XrRzDwb6 for ; Thu, 22 Dec 2016 17:21:13 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tkhGk4nWGzDwYh for ; Thu, 22 Dec 2016 17:20:46 +1100 (AEDT) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uBM6JVEa005550 for ; Thu, 22 Dec 2016 01:20:44 -0500 Received: from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207]) by mx0b-001b2d01.pphosted.com with ESMTP id 27g1uund7g-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 22 Dec 2016 01:20:43 -0500 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 22 Dec 2016 01:20:43 -0500 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e17.ny.us.ibm.com (146.89.104.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 22 Dec 2016 01:20:41 -0500 Received: from b01cxnp23032.gho.pok.ibm.com (b01cxnp23032.gho.pok.ibm.com [9.57.198.27]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 204D76E8040 for ; Thu, 22 Dec 2016 01:20:14 -0500 (EST) Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id uBM6KfLQ16318828; Thu, 22 Dec 2016 06:20:41 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EDE91AC041; Thu, 22 Dec 2016 01:20:40 -0500 (EST) Received: from birb.localdomain (unknown [9.185.16.22]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP id 6A462AC03F; Thu, 22 Dec 2016 01:20:40 -0500 (EST) Received: by birb.localdomain (Postfix, from userid 1000) id BE9282277BFD; Thu, 22 Dec 2016 17:20:36 +1100 (AEDT) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Thu, 22 Dec 2016 17:20:27 +1100 X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161222062036.8454-1-stewart@linux.vnet.ibm.com> References: <20161222062036.8454-1-stewart@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16122206-0040-0000-0000-00000230ED94 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006294; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000198; SDB=6.00797304; UDB=6.00387054; IPR=6.00575111; BA=6.00004998; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00013682; XFM=3.00000011; UTC=2016-12-22 06:20:42 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16122206-0041-0000-0000-00000623F484 Message-Id: <20161222062036.8454-3-stewart@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-12-22_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1612220106 Subject: [Skiboot] [PATCH 02/11] travis: use curl rather than wget X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Signed-off-by: Stewart Smith --- opal-ci/Dockerfile-centos6 | 2 +- opal-ci/Dockerfile-centos7 | 2 +- opal-ci/Dockerfile-fedora-rawhide | 2 +- opal-ci/Dockerfile-fedora24 | 2 +- opal-ci/Dockerfile-ubuntu-12.04 | 6 +++--- opal-ci/Dockerfile-ubuntu-16.04 | 4 ++-- opal-ci/Dockerfile-ubuntu-latest | 4 ++-- 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