* [Qemu-devel] [PATCH] docker/dockerfiles/debian-s390-cross: include clang
@ 2017-03-06 11:28 Alex Bennée
2017-03-07 10:37 ` Fam Zheng
0 siblings, 1 reply; 6+ messages in thread
From: Alex Bennée @ 2017-03-06 11:28 UTC (permalink / raw)
To: famz; +Cc: qemu-devel, Alex Bennée
It's a silly little limitation on Shippable that is looks for clang
in the container even though we won't use it. The arm/aarch64 cross
builds inherit this from debian.docker but as we needed to use
debian-testing for this we add it here. We also collapse the update
step into one RUN line to remove and intermediate layer of the docker
build.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index bbb21ed088..3a687feda0 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
RUN dpkg --add-architecture s390x
# Grab the updated list of packages
-RUN apt update
-RUN apt dist-upgrade -yy
+RUN apt update && apt dist-upgrade -yy
+RUN apt install -yy build-essential clang
RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] docker/dockerfiles/debian-s390-cross: include clang
2017-03-06 11:28 [Qemu-devel] [PATCH] docker/dockerfiles/debian-s390-cross: include clang Alex Bennée
@ 2017-03-07 10:37 ` Fam Zheng
2017-03-07 11:45 ` Philippe Mathieu-Daudé
2017-03-07 13:41 ` Alex Bennée
0 siblings, 2 replies; 6+ messages in thread
From: Fam Zheng @ 2017-03-07 10:37 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel
On Mon, 03/06 11:28, Alex Bennée wrote:
> It's a silly little limitation on Shippable that is looks for clang
> in the container even though we won't use it. The arm/aarch64 cross
> builds inherit this from debian.docker but as we needed to use
> debian-testing for this we add it here. We also collapse the update
> step into one RUN line to remove and intermediate layer of the docker
> build.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
> index bbb21ed088..3a687feda0 100644
> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
> @@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
> RUN dpkg --add-architecture s390x
>
> # Grab the updated list of packages
> -RUN apt update
> -RUN apt dist-upgrade -yy
> +RUN apt update && apt dist-upgrade -yy
> +RUN apt install -yy build-essential clang
> RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
> RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
>
> --
> 2.11.0
>
Looks sane. Is this for 2.9?
Fam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] docker/dockerfiles/debian-s390-cross: include clang
2017-03-07 10:37 ` Fam Zheng
@ 2017-03-07 11:45 ` Philippe Mathieu-Daudé
2017-03-07 13:40 ` Alex Bennée
2017-03-07 13:41 ` Alex Bennée
1 sibling, 1 reply; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-03-07 11:45 UTC (permalink / raw)
To: Fam Zheng, Alex Bennée; +Cc: qemu-devel
Hi Alex, Fam.
I tested this way but got an error:
qemu (docker_alex)$ make docker-test-clang@debian-s390x-cross
BUILD debian-s390x-cross
make[1]: Entering directory 'qemu'
ARCHIVE qemu.tgz
ARCHIVE dtc.tgz
ARCHIVE pixman.tgz
COPY RUNNER
RUN test-clang in qemu:debian-s390x-cross
Prerequisite 'clang' not present, skip
make[1]: Leaving directory 'qemu'
am I missing something? like a FEATURES/clang.tgz?
qemu (docker_alex)$ docker run qemu:debian-s390x-cross which clang
/usr/bin/clang
On 03/07/2017 07:37 AM, Fam Zheng wrote:
> On Mon, 03/06 11:28, Alex Bennée wrote:
>> It's a silly little limitation on Shippable that is looks for clang
>> in the container even though we won't use it. The arm/aarch64 cross
>> builds inherit this from debian.docker but as we needed to use
>> debian-testing for this we add it here. We also collapse the update
>> step into one RUN line to remove and intermediate layer of the docker
>> build.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>> tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
>> index bbb21ed088..3a687feda0 100644
>> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
>> @@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
>> RUN dpkg --add-architecture s390x
>>
>> # Grab the updated list of packages
>> -RUN apt update
>> -RUN apt dist-upgrade -yy
>> +RUN apt update && apt dist-upgrade -yy
^ good!
>> +RUN apt install -yy build-essential clang
>> RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
>> RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
>>
>> --
>> 2.11.0
>>
>
> Looks sane. Is this for 2.9?
>
> Fam
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] docker/dockerfiles/debian-s390-cross: include clang
2017-03-07 11:45 ` Philippe Mathieu-Daudé
@ 2017-03-07 13:40 ` Alex Bennée
0 siblings, 0 replies; 6+ messages in thread
From: Alex Bennée @ 2017-03-07 13:40 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Fam Zheng, qemu-devel
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:
> Hi Alex, Fam.
>
> I tested this way but got an error:
>
> qemu (docker_alex)$ make docker-test-clang@debian-s390x-cross
> BUILD debian-s390x-cross
> make[1]: Entering directory 'qemu'
> ARCHIVE qemu.tgz
> ARCHIVE dtc.tgz
> ARCHIVE pixman.tgz
> COPY RUNNER
> RUN test-clang in qemu:debian-s390x-cross
> Prerequisite 'clang' not present, skip
> make[1]: Leaving directory 'qemu'
>
> am I missing something? like a FEATURES/clang.tgz?
>
> qemu (docker_alex)$ docker run qemu:debian-s390x-cross which clang
> /usr/bin/clang
>
> On 03/07/2017 07:37 AM, Fam Zheng wrote:
>> On Mon, 03/06 11:28, Alex Bennée wrote:
>>> It's a silly little limitation on Shippable that is looks for clang
>>> in the container even though we won't use it. The arm/aarch64 cross
The clang is only to keep shippable happy. It scans for compilers
despite the fact our actual build is using the cross-compiler. AFAIK
Debian don't package cross-built versions of clang. It would be nice if
they did by currently all our cross-build containers use GCC.
>>> builds inherit this from debian.docker but as we needed to use
>>> debian-testing for this we add it here. We also collapse the update
>>> step into one RUN line to remove and intermediate layer of the docker
>>> build.
>>>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>> tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
>>> index bbb21ed088..3a687feda0 100644
>>> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
>>> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
>>> @@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
>>> RUN dpkg --add-architecture s390x
>>>
>>> # Grab the updated list of packages
>>> -RUN apt update
>>> -RUN apt dist-upgrade -yy
>>> +RUN apt update && apt dist-upgrade -yy
>
> ^ good!
>
>>> +RUN apt install -yy build-essential clang
>>> RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
>>> RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
>>>
>>> --
>>> 2.11.0
>>>
>>
>> Looks sane. Is this for 2.9?
>>
>> Fam
>>
--
Alex Bennée
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] docker/dockerfiles/debian-s390-cross: include clang
2017-03-07 10:37 ` Fam Zheng
2017-03-07 11:45 ` Philippe Mathieu-Daudé
@ 2017-03-07 13:41 ` Alex Bennée
2017-03-08 6:15 ` Fam Zheng
1 sibling, 1 reply; 6+ messages in thread
From: Alex Bennée @ 2017-03-07 13:41 UTC (permalink / raw)
To: Fam Zheng; +Cc: qemu-devel
Fam Zheng <famz@redhat.com> writes:
> On Mon, 03/06 11:28, Alex Bennée wrote:
>> It's a silly little limitation on Shippable that is looks for clang
>> in the container even though we won't use it. The arm/aarch64 cross
>> builds inherit this from debian.docker but as we needed to use
>> debian-testing for this we add it here. We also collapse the update
>> step into one RUN line to remove and intermediate layer of the docker
>> build.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>> tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
>> index bbb21ed088..3a687feda0 100644
>> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
>> @@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
>> RUN dpkg --add-architecture s390x
>>
>> # Grab the updated list of packages
>> -RUN apt update
>> -RUN apt dist-upgrade -yy
>> +RUN apt update && apt dist-upgrade -yy
>> +RUN apt install -yy build-essential clang
>> RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
>> RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
>>
>> --
>> 2.11.0
>>
>
> Looks sane. Is this for 2.9?
Yes please. The s390x cross build on shippable is currently broken
without it although we can use the container locally.
--
Alex Bennée
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] docker/dockerfiles/debian-s390-cross: include clang
2017-03-07 13:41 ` Alex Bennée
@ 2017-03-08 6:15 ` Fam Zheng
0 siblings, 0 replies; 6+ messages in thread
From: Fam Zheng @ 2017-03-08 6:15 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel
On Tue, 03/07 13:41, Alex Bennée wrote:
>
> Fam Zheng <famz@redhat.com> writes:
>
> > On Mon, 03/06 11:28, Alex Bennée wrote:
> >> It's a silly little limitation on Shippable that is looks for clang
> >> in the container even though we won't use it. The arm/aarch64 cross
> >> builds inherit this from debian.docker but as we needed to use
> >> debian-testing for this we add it here. We also collapse the update
> >> step into one RUN line to remove and intermediate layer of the docker
> >> build.
> >>
> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> >> ---
> >> tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
> >> index bbb21ed088..3a687feda0 100644
> >> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
> >> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
> >> @@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
> >> RUN dpkg --add-architecture s390x
> >>
> >> # Grab the updated list of packages
> >> -RUN apt update
> >> -RUN apt dist-upgrade -yy
> >> +RUN apt update && apt dist-upgrade -yy
> >> +RUN apt install -yy build-essential clang
> >> RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
> >> RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
> >>
> >> --
> >> 2.11.0
> >>
> >
> > Looks sane. Is this for 2.9?
>
> Yes please. The s390x cross build on shippable is currently broken
> without it although we can use the container locally.
OK, I'll send a pull request soon.
Fam
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-08 6:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-06 11:28 [Qemu-devel] [PATCH] docker/dockerfiles/debian-s390-cross: include clang Alex Bennée
2017-03-07 10:37 ` Fam Zheng
2017-03-07 11:45 ` Philippe Mathieu-Daudé
2017-03-07 13:40 ` Alex Bennée
2017-03-07 13:41 ` Alex Bennée
2017-03-08 6:15 ` Fam Zheng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).