From patchwork Sat May 27 16:17:37 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: 9752021 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 10D2B6032C for ; Sat, 27 May 2017 16:20:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03A762833E for ; Sat, 27 May 2017 16:20:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECAB1283BB; Sat, 27 May 2017 16:20:00 +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 467172833E for ; Sat, 27 May 2017 16:19:59 +0000 (UTC) Received: from localhost ([::1]:41343 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEeRa-0006JO-FX for patchwork-qemu-devel@patchwork.kernel.org; Sat, 27 May 2017 12:19:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEeQG-0006HU-5Y for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEeQF-0005mw-6c for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:36 -0400 Received: from mail-oi0-x244.google.com ([2607:f8b0:4003:c06::244]:33924) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dEeQF-0005mT-1D for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:35 -0400 Received: by mail-oi0-x244.google.com with SMTP id w10so6038756oif.1 for ; Sat, 27 May 2017 09:18:34 -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=PaPpurOOoV+2A93SXcUg232e/LH3LwJoiDb05ExIXt0=; b=lpGrCdaojUiy5HBr7/qTx3h2Ox+ghjUWTOErtTmNsevrNKSS5XHL1oorh1+fyxQn3O iyPaqvKaU1wHifU1mbRjtFPChrlCwXixTIfKiTbh0ygiw5nkxehF28HVC3vAef0dfykG 2Fzp1rPYOnCHFdwaKm1eXiHXVoALsa7BDLOXIGN1O+SR6F4zGrM9YpDdMJaUi/t4gEZP RcO0qqlzKG/JX5ZbLIdw/syFL4ryk6cD1EII6LiYjUPhoNsUyP8eqdpRdGmVs21hgjwK n09vwavNWVUH5WxABiDir4fATv/eBumrD00Ib2aDl7rEIO0WNMseK1z1hPe2BUyMRJcU yaGQ== 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=PaPpurOOoV+2A93SXcUg232e/LH3LwJoiDb05ExIXt0=; b=C14UsxliZ79KSolDXgqD7CoMU9ZKvpQ/O9UBq5zzXHEag6P3dj9Nd6VmVmIULV6MLV FOdqm8dtfokqlveZR2TwlLHKb5OJ1dLZ3Awi5NTchUpKJuXdJmVUDrYJL4eAoepilR4L aClHEnOpaK7GBhxuOzYf9VPxcwto6AFJo9eIO2SbUZ5zBZssx79Y4CF8cFUGNvyCXxSX Dfa9mG+FOIx5TEdXD+mTQGJDzkU5kgPeykopRMqCJB6XeEX/M4w4uITfxwI2pDYM2wCy KPKSUrQgv/AHEJksx+Ws0QQpwh/XLT5EQoZ7Zg2W2J/NxX+lIL79AL6z7SQiU4/njT3j K6QQ== X-Gm-Message-State: AODbwcBMaXVKupsGGd6fHgM0/L4IIpE8CK/buyahFCN5+YqJfPtVLXIa wuVA3EByLULgdACXRLY= X-Received: by 10.157.63.149 with SMTP id r21mr126239otc.89.1495901914408; Sat, 27 May 2017 09:18:34 -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 i32sm1953113otd.43.2017.05.27.09.18.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 May 2017 09:18:33 -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: Sat, 27 May 2017 13:17:37 -0300 Message-Id: <20170527161755.7761-7-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170527161755.7761-1-f4bug@amsat.org> References: <20170527161755.7761-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::244 Subject: [Qemu-devel] [PATCH v4 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 -