From patchwork Mon May 8 04:57:06 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: 9715739 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 16271602A0 for ; Mon, 8 May 2017 05:07:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF2D5200F5 for ; Mon, 8 May 2017 05:07:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E253F20373; Mon, 8 May 2017 05:07:21 +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 4DA2E200F5 for ; Mon, 8 May 2017 05:07:21 +0000 (UTC) Received: from localhost ([::1]:57675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7atE-0001tU-Et for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 May 2017 01:07:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7akw-000414-Iu for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7akv-0007xT-H5 for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:46 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:34000) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7akv-0007xP-DM for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:45 -0400 Received: by mail-qt0-x244.google.com with SMTP id l39so8242882qtb.1 for ; Sun, 07 May 2017 21:58:45 -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=9FS0i0w/fmCbeXWCG0ICiy1PZ8ws0v8H7SD99mJ9SnU=; b=n2binQtzJ2QNtQprJvxDTygFFTXpgbbQJcsEx/DHCq4QP2ZQLS9B2rHJjKMgSWHsAf nF/5RX8nHCCERZPfqDB9dymph9zQnA1cXEUBikfTq1LI3bymXWdHHnAENZl6ca2Cnf6+ h/DvEKj+AMCFP51TiLcPNgWAHCreu1iy6Ej9Fp5tpyjtz3cnM16GuD1zyQrZz8MzEYa7 njezbjDBGpMg6xW7X0s5spj2MRpuSRkSZJba+9PEnGZOKEOLm4g/sPd9Yvyhp+AUrmZp fR1HwcYY8VUNUr1HP6VpkLPO/VOXO92EreTAwpPT1wb/DbRAbsFizyZfrPI7UuOhj5qm NQSQ== 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=9FS0i0w/fmCbeXWCG0ICiy1PZ8ws0v8H7SD99mJ9SnU=; b=l6gIt3WcHFJwbCeR6W2mueEBIc6W97ExM9qfQufQlObvmIeSB5jg7ogvGsl29NoeZ2 HLlPJHC4KNX9XmiRfOZSXxtn3nWQs7gE+ZN9R8NDYfDKxrEddbGjo+PCTxx01G/XZq8x 8+0cumuNuqyTjexRV/UeqFrxPFuwsQUpn0OZww0x6uLEAJQznQs1+9oO8k9Gs0uhCEHw zn/yKE2JGd8r4TPdL9G9C9nLMHfX9NCq16SAgG97977A6+0AN0n5VWSNXGDb85HEjACv 5vbSRWcS9Il7Tpfh80m1BT1HqfskXnsOEgdgDqZ2mBzYQv3azdj08IEH9KOIdSYiHU2w QXfg== X-Gm-Message-State: AODbwcD6jXzEc3jL7ATlQxAaRAdPMzcg2CjbVdiqCkwmGSwb9+l0ndXn goumYpy4O1rgcg== X-Received: by 10.200.47.210 with SMTP id m18mr717881qta.44.1494219524812; Sun, 07 May 2017 21:58:44 -0700 (PDT) Received: from localhost.localdomain ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id m188sm4358549qkc.5.2017.05.07.21.58.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 May 2017 21:58:44 -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 , Aurelien Jarno , Riku Voipio , Vagrant Cascadian , Michael Tokarev Date: Mon, 8 May 2017 01:57:06 -0300 Message-Id: <20170508045715.21770-15-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170508045715.21770-1-f4bug@amsat.org> References: <20170508045715.21770-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:400d:c0d::244 Subject: [Qemu-devel] [RFC PATCH 14/23] docker: add 'apt-fake' script which generate fake debian packages 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é --- tests/docker/Makefile.include | 2 ++ tests/docker/dockerfiles/debian-apt-fake.sh | 46 +++++++++++++++++++++++++++++ tests/docker/dockerfiles/debian.docker | 2 ++ 3 files changed, 50 insertions(+) create mode 100755 tests/docker/dockerfiles/debian-apt-fake.sh diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 47978fb56c..ca6f57a292 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -55,6 +55,8 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXTRA_FILE),--include-file=$(EXTRA_FILE)),\ "BUILD","$*") +docker-image-debian: EXTRA_FILE:=tests/docker/dockerfiles/debian-apt-fake.sh + # Enforce dependancies for composite images docker-image-debian-armhf-cross: docker-image-debian docker-image-debian-arm64-cross: docker-image-debian diff --git a/tests/docker/dockerfiles/debian-apt-fake.sh b/tests/docker/dockerfiles/debian-apt-fake.sh new file mode 100755 index 0000000000..387522c174 --- /dev/null +++ b/tests/docker/dockerfiles/debian-apt-fake.sh @@ -0,0 +1,46 @@ +#! /bin/sh +# +# Generate fake debian package to resolve unimportant unmet dependencies held +# by upstream multiarch broken packages. +# +# Copyright (c) 2017 Philippe Mathieu-Daudé +# +# This work is licensed under the terms of the GNU GPL, version 2 +# or (at your option) any later version. See the COPYING file in +# the top-level directory. + +test $1 = "install" && shift 1 + +fake_install() +{ + echo "Generating fake $2 $1 $3 ..." + (cd /var/cache/apt/archives + (cat << 'EOF' +Section: misc +Priority: optional +Standards-Version: 3.9.2 + +Package: NAME +Version: VERSION +Maintainer: qemu-devel@nongnu.org +Architecture: any +Multi-Arch: same +Description: fake NAME +EOF + ) | sed s/NAME/$2/g | sed s/VERSION/$3/g > $2.control + equivs-build -a $1 $2.control 1>/dev/null 2>/dev/null + dpkg -i $2_$3_$1.deb + ) +} + +try_install() +{ + name=$(echo $1|sed "s/\(.*\):\(.*\)=\(.*\)/\1/") + arch=$(echo $1|sed "s/\(.*\):\(.*\)=\(.*\)/\2/") + vers=$(echo $1|sed "s/\(.*\):\(.*\)=\(.*\)/\3/") + apt-get install -q -yy $1 || fake_install $arch $name $vers +} + +for package in $*; do + try_install $package +done diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker index 694f8d3b63..a99396ae8f 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -22,6 +22,8 @@ RUN apt-get update && \ # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list +ADD debian-apt-fake.sh /usr/local/bin/apt-fake + # Setup Emdebian RUN 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 -