travis: fix building on s390x

Submitted by Adrian Reber on June 28, 2018, 9:46 a.m.

Details

Message ID 1530179205-16706-1-git-send-email-adrian@lisas.de
State Accepted
Series "travis: fix building on s390x"
Commit fc11d59db11c8f3b7e43e93f6a0cbfee153f077a
Headers show

Commit Message

Adrian Reber June 28, 2018, 9:46 a.m.
From: Adrian Reber <areber@redhat.com>

The travis build for s390x started to fail with:

Failed to fetch http://security.debian.org/debian-security/dists/jessie/updates/InRelease Unable to find expected entry 'main/binary-s390x/Packages' in Release file (Wrong sources.list entry or malformed file)

This changes the repository definition just like it is done for ppc64le.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.s390x.hdr | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/scripts/build/Dockerfile.s390x.hdr b/scripts/build/Dockerfile.s390x.hdr
index 37ff208..7c92fe0 100644
--- a/scripts/build/Dockerfile.s390x.hdr
+++ b/scripts/build/Dockerfile.s390x.hdr
@@ -2,3 +2,5 @@  FROM s390x/debian:jessie-backports
 
 ENV QEMU_CPU z900
 COPY scripts/build/qemu-user-static/usr/bin/qemu-s390x-static /usr/bin/qemu-s390x-static
+# The security repository does not seem to exist anymore
+RUN sed -i '/security/ d' /etc/apt/sources.list

Comments

Andrey Vagin July 11, 2018, 12:12 a.m.
Applied, thanks

On Thu, Jun 28, 2018 at 09:46:45AM +0000, Adrian Reber wrote:
> From: Adrian Reber <areber@redhat.com>
> 
> The travis build for s390x started to fail with:
> 
> Failed to fetch http://security.debian.org/debian-security/dists/jessie/updates/InRelease Unable to find expected entry 'main/binary-s390x/Packages' in Release file (Wrong sources.list entry or malformed file)
> 
> This changes the repository definition just like it is done for ppc64le.
> 
> Signed-off-by: Adrian Reber <areber@redhat.com>
> ---
>  scripts/build/Dockerfile.s390x.hdr | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/scripts/build/Dockerfile.s390x.hdr b/scripts/build/Dockerfile.s390x.hdr
> index 37ff208..7c92fe0 100644
> --- a/scripts/build/Dockerfile.s390x.hdr
> +++ b/scripts/build/Dockerfile.s390x.hdr
> @@ -2,3 +2,5 @@ FROM s390x/debian:jessie-backports
>  
>  ENV QEMU_CPU z900
>  COPY scripts/build/qemu-user-static/usr/bin/qemu-s390x-static /usr/bin/qemu-s390x-static
> +# The security repository does not seem to exist anymore
> +RUN sed -i '/security/ d' /etc/apt/sources.list
> -- 
> 1.8.3.1
>
alice Aug. 15, 2018, 12:59 p.m.
sorry, it didn't see the emails. I was on vacation and they got lost in the mass of emails.

Regards

Alice


On 07/11/2018 02:12 AM, Andrei Vagin wrote:
> Applied, thanks
>
> On Thu, Jun 28, 2018 at 09:46:45AM +0000, Adrian Reber wrote:
>> From: Adrian Reber <areber@redhat.com>
>>
>> The travis build for s390x started to fail with:
>>
>> Failed to fetch http://security.debian.org/debian-security/dists/jessie/updates/InRelease Unable to find expected entry 'main/binary-s390x/Packages' in Release file (Wrong sources.list entry or malformed file)
>>
>> This changes the repository definition just like it is done for ppc64le.
>>
>> Signed-off-by: Adrian Reber <areber@redhat.com>
>> ---
>>   scripts/build/Dockerfile.s390x.hdr | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/scripts/build/Dockerfile.s390x.hdr b/scripts/build/Dockerfile.s390x.hdr
>> index 37ff208..7c92fe0 100644
>> --- a/scripts/build/Dockerfile.s390x.hdr
>> +++ b/scripts/build/Dockerfile.s390x.hdr
>> @@ -2,3 +2,5 @@ FROM s390x/debian:jessie-backports
>>   
>>   ENV QEMU_CPU z900
>>   COPY scripts/build/qemu-user-static/usr/bin/qemu-s390x-static /usr/bin/qemu-s390x-static
>> +# The security repository does not seem to exist anymore
>> +RUN sed -i '/security/ d' /etc/apt/sources.list
>> -- 
>> 1.8.3.1
>>