From patchwork Sun May 21 03:29:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 9738835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9821060326 for ; Sun, 21 May 2017 03:37:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86BFF2853A for ; Sun, 21 May 2017 03:37:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7ABED28692; Sun, 21 May 2017 03:37:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0037E2853A for ; Sun, 21 May 2017 03:37:18 +0000 (UTC) Received: from localhost ([::1]:36171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCHgD-0005sY-Hl for patchwork-qemu-devel@patchwork.kernel.org; Sat, 20 May 2017 23:37:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCHZb-0001Mm-K6 for qemu-devel@nongnu.org; Sat, 20 May 2017 23:30:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dCHZa-0007Eg-Iu for qemu-devel@nongnu.org; Sat, 20 May 2017 23:30:27 -0400 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]:34002) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dCHZa-0007EZ-EB for qemu-devel@nongnu.org; Sat, 20 May 2017 23:30:26 -0400 Received: by mail-oi0-x242.google.com with SMTP id w10so18059712oif.1 for ; Sat, 20 May 2017 20:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z/HYQ9Hcu6Q1KEV45J+JL+NGdMmXHwRE1/kbAR5Tp9Y=; b=IzKA9zE1qsbZPu4goL/gdP7FZaunxuKgmQ3UvcOrbVfRqVYdXEVslL+Tm4hV4y2xBe Mgbc49gqbN7HUQvt4NlE3ZBOh7jj24kLU0m2EqFnhp9M8t9FnBVn5VK7h4jF9f2ExDUP XJuoosCygcNOb1lpG9zKuk4gQN7LVpsarGEJ0B3A8NPjecl1CHMq2ARG0EtzzWacl7oU adWhCf0nT0Lrtu959ew8lFS77I+YrM5se8Po9pXspg5PsmG9lKfs9nbKu0LkgbMyeDMG bKmxB4AfqH3vu/cjpRC1/FM/K+b0uxR10lHPtC5QEcFmCw/T/+8FHt3RDVE7PXbcb46j M4qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=z/HYQ9Hcu6Q1KEV45J+JL+NGdMmXHwRE1/kbAR5Tp9Y=; b=DkxYW0nIIbIB4L4/LXDsQEG81YNPG3PA3cdSJOaoj8WXJZ3HRxPI+fbmG5jr4Pj8Rd 9g1Os7+guEDRlxXf0HY+bJ75nd4KMs9W40CYPAjmpL4kvIbZ2grUUiVteov7az8moP1x mS9Ih3y44Tabo0osMs+W5TqXhXds8QE/L6onpYD+XBpoLV/TTkbp5Oq/IvgAe0BmY9b9 ht6VPQwLuBhicK/gjs7haLS4yyYGntePIrwNhGmjQB2HE9c8sByGeosujo1D10iAAcEb TtD05eDVnpprP+KcF9IcDc1ujw8SIj4izdOFaWs3tGkzSyY7jqTh7kOeUmci1mL6S0JP g/+g== X-Gm-Message-State: AODbwcDDAl1hhvXhQoD8ue8ahXKy6t61+NERzL2FGZJYimqHG08dGX3c /JPJwvmh+z2Q2Q== X-Received: by 10.157.15.205 with SMTP id m13mr10573165otd.6.1495337425728; Sat, 20 May 2017 20:30:25 -0700 (PDT) Received: from yoga.attlocal.net (162-231-236-127.lightspeed.miamfl.sbcglobal.net. [162.231.236.127]) by smtp.gmail.com with ESMTPSA id u23sm6499219otg.31.2017.05.20.20.30.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 May 2017 20:30:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sun, 21 May 2017 00:29:38 -0300 Message-Id: <20170521032956.27446-7-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170521032956.27446-1-f4bug@amsat.org> References: <20170521032956.27446-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::242 Subject: [Qemu-devel] [PATCH v3 06/24] docker: create deb-src entry and setup Emdebian in the same layer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée --- tests/docker/dockerfiles/debian.docker | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker index d08def6a8d..33ba686892 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -13,13 +13,11 @@ FROM debian:stable-slim RUN apt update RUN apt install -yy aptitude ca-certificates curl -# Setup Emdebian -RUN echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list -RUN curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list - # Install common build utilities RUN apt update RUN apt install -yy build-essential clang + +# Duplicate deb line as deb-src, setup Emdebian +RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list && \ + echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list && \ + curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -