From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PULL 06/21] tests: use in-place sed magic for enabling deb-src in travis image
Date: Mon, 14 Jan 2019 15:01:14 +0000 [thread overview]
Message-ID: <20190114150129.1013-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org>
This avoids potential problems with duplicates.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
index 03ebfb0ef2..46cf367488 100644
--- a/tests/docker/dockerfiles/travis.docker
+++ b/tests/docker/dockerfiles/travis.docker
@@ -2,7 +2,7 @@ FROM travisci/ci-garnet:packer-1512502276-986baf0
ENV DEBIAN_FRONTEND noninteractive
ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8
-RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list
+RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list
RUN apt-get update
RUN apt-get -y build-dep qemu
RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr
--
2.17.1
next prev parent reply other threads:[~2019-01-14 15:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 15:01 [Qemu-devel] [PULL 00/21] misc testing fixes for Travis and docker Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 01/21] docker: Use stable git tag for virglrenderer Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 02/21] tests: run ldconfig after installing extra software Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 03/21] tests: remove obsolete 'debian' dockerfile Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 04/21] tests: update Fedora dockerfile to use Fedora 29 Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 05/21] tests: update Fedora i386 cross image to " Alex Bennée
2019-01-14 15:01 ` Alex Bennée [this message]
2019-01-14 15:01 ` [Qemu-devel] [PULL 07/21] travis: add whitespace between each major section & matrix entry Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 08/21] travis: define all the build matrix entries in one place Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 09/21] travis: standardize the syntax used for env variables Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 10/21] travis: don't clone git submodules upfront Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 11/21] travis: use homebrew addon for MacOSX Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 12/21] travis: stop redefining the script commands Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 13/21] travis: stop using container based envs Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 14/21] travis: run tests in verbose mode Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 15/21] travis: remove matrix settings that duplicate global settings Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 16/21] docker: Use a stable snapshot for Debian Sid Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 17/21] travis: bump to Xenial baseline Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 18/21] tests/docker: update our Travis image Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 19/21] tests/docker: remove SID_AGE test hack Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 20/21] tests: use g_usleep instead of rem = sleep(time) Alex Bennée
2019-01-14 15:01 ` [Qemu-devel] [PULL 21/21] Revert "tests: Disable qht-bench parallel test when using gprof" Alex Bennée
2019-01-14 15:31 ` Alex Bennée
2019-01-15 11:38 ` [Qemu-devel] [PULL 00/21] misc testing fixes for Travis and docker Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190114150129.1013-7-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).