| Message ID | 20161028163339.31096-4-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, 10/28 17:33, Alex Bennée wrote: > In our .travis.yml we install a bunch of extra libraries which are not > part of the packaged QEMU's builddeps. We include them here to make our > docker container more closely match the state of the system after docker > has installed the rest of the build dependencies. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/dockerfiles/travis.docker | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker > index e4983ae..6bef722 100644 > --- a/tests/docker/dockerfiles/travis.docker > +++ b/tests/docker/dockerfiles/travis.docker > @@ -2,5 +2,12 @@ FROM quay.io/travisci/travis-ruby > RUN apt-get update > RUN apt-get -y build-dep qemu > RUN apt-get -y build-dep device-tree-compiler > -RUN apt-get -y install python2.7 dh-autoreconf > +# Additional optional libs not in QEMU's builddep > +RUN apt-get -y install libbrlapi-dev liblttng-ust-dev libcap-ng-dev \ > + libnfs-dev libnss3-dev libpixman-1-dev \ > + libpng12-dev librados-dev libseccomp-dev \ > + libspice-protocol-dev libspice-server-dev \ > + libssh2-1-dev liburcu-dev libusb-1.0-0-dev \ > + libvte-2.90-dev > +RUN apt-get -y install python2.7 dh-autoreconf sparse Any reason to use two apt-get lines? Also, can you put these package names in $PACKAGES and dump 'dpkg -l $PACKAGES' to /packages.txt like in ubuntu.docker? That way we can print it in reports by adding SHOW_ENV=1 in make invocation. Fam > ENV FEATURES pyyaml > -- > 2.10.1 > >
diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index e4983ae..6bef722 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -2,5 +2,12 @@ FROM quay.io/travisci/travis-ruby RUN apt-get update RUN apt-get -y build-dep qemu RUN apt-get -y build-dep device-tree-compiler -RUN apt-get -y install python2.7 dh-autoreconf +# Additional optional libs not in QEMU's builddep +RUN apt-get -y install libbrlapi-dev liblttng-ust-dev libcap-ng-dev \ + libnfs-dev libnss3-dev libpixman-1-dev \ + libpng12-dev librados-dev libseccomp-dev \ + libspice-protocol-dev libspice-server-dev \ + libssh2-1-dev liburcu-dev libusb-1.0-0-dev \ + libvte-2.90-dev +RUN apt-get -y install python2.7 dh-autoreconf sparse ENV FEATURES pyyaml
In our .travis.yml we install a bunch of extra libraries which are not part of the packaged QEMU's builddeps. We include them here to make our docker container more closely match the state of the system after docker has installed the rest of the build dependencies. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/dockerfiles/travis.docker | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.10.1