From patchwork Thu Jun 28 16:46:36 2018 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: 936260 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B3kLuoO0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gm3m2Zrmz9ryk for ; Fri, 29 Jun 2018 02:50:12 +1000 (AEST) Received: from localhost ([::1]:37602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa7W-0000NG-2P for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 12:50:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa4Q-00075a-4Z for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:46:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa4O-0003ke-Uj for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:46:58 -0400 Received: from mail-qk0-x230.google.com ([2607:f8b0:400d:c09::230]:37036) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa4O-0003jF-Pn for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:46:56 -0400 Received: by mail-qk0-x230.google.com with SMTP id t79-v6so3351450qke.4 for ; Thu, 28 Jun 2018 09:46:56 -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=CdqZEd53oM9lGIZQ+bzJ6u+UyFVYG3VB/IKJ51Dmids=; b=B3kLuoO0Gkrct4Kv+gm2RNHsP2QIx0xHtiL6CqpL5nTcOauCI/3yAE91LBohdn9TbA La+/ktiHbItORLghiH6zZhWXij8Zfrmsly4pd6ipig8EU45PFXEIHjaC1Y0sG41iur10 Ss6A7fiAH2e565CZiDo8eJdhBrbMLoFD127IXZOZu1JvI0rvIwez0RPQcvlX4NPv/qew Hj9Epse4d1uFFBpuKeYdr1OfLW0OeCD/KACIBUj3XOBhdGgqxXzQhtW0sEvLM1T7Dx5n FtUWFiOmXIhyImFbf10srOu19leTYRO4p3bx5KlspcmBsz30DLOfhiDtbr29BOTW1hA6 wnaQ== 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=CdqZEd53oM9lGIZQ+bzJ6u+UyFVYG3VB/IKJ51Dmids=; b=GHDEBFCappngVYbKXwwPFK8QGN9vcb4YMDeRnxVPPwocJIfwkQteRQ+l89Z3plF53l XfWBKHvxPYJJ5wbFIouXIGQwECJwWtJ+ORtstHCdyAhl/VhSk6wlhyI8bGCK7AignOHi Uz8xHMCCWNL5p5dQHjt4/Zl2maM63mSPqb5ZzGNh+LcXqtJBLMJ8S6NmfxEbjKOogkUk xDO/SdioFchv0EpfzuS4N1qSbZFlrLw8Iy62pPE4h/pbNKNTIbQAR6uP+3N5svDEd0p9 Z/yj1Cm863dN6OpJ3GT46R61OdjLgZe29mddYy75Gqyju2J0gq6pPW5qBEnqbgjhKUBL 1tzg== X-Gm-Message-State: APt69E2r8WNdNTMhumHGTM69SrWafN79EDntGqJA4npAbT8JiWilRE7p Py0tSF+1kqyNqopeB5ux0cA= X-Google-Smtp-Source: AAOMgpcqkSoAlKjzUVh134cGkKfjHwC1NY/oLpS0xtJd7Jl5RoGglyKupMpVyDZvTrJ51AtooTUBuw== X-Received: by 2002:a37:6c46:: with SMTP id h67-v6mr9448743qkc.38.1530204416181; Thu, 28 Jun 2018 09:46:56 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.46.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:46:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng Date: Thu, 28 Jun 2018 13:46:36 -0300 Message-Id: <20180628164643.9668-2-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-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:c09::230 Subject: [Qemu-devel] [PATCH 1/8] docker: ubuntu: Update the package list before installing new ones 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_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since docker caches the different layers, updating the package list does not invalidate the previous "apt-get update" layer, and it is likely "apt-get install" hits an outdated repository. See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get This fixes: $ make docker-image-ubuntu V=1 ./tests/docker/docker.py build qemu:ubuntu tests/docker/dockerfiles/ubuntu.docker --add-current-user Sending build context to Docker daemon 3.072kB [...] E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgles2-mesa_17.0.7-0ubuntu0.16.04.2_amd64.deb 404 Not Found E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgles2-mesa-dev_17.0.7-0ubuntu0.16.04.2_amd64.deb 404 Not Found E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing? The command '/bin/sh -c apt-get -y install $PACKAGES' returned a non-zero code: 100 tests/docker/Makefile.include:40: recipe for target 'docker-image-ubuntu' failed make: *** [docker-image-ubuntu] Error 1 Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/ubuntu.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index dabbf2a8a4..c03520ce3f 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -1,7 +1,6 @@ FROM ubuntu:16.04 RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \ /etc/apt/sources.list -RUN apt-get update ENV PACKAGES flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ @@ -13,6 +12,7 @@ ENV PACKAGES flex bison \ libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \ texinfo \ gettext git make ccache python-yaml gcc clang sparse -RUN apt-get -y install $PACKAGES +RUN apt-get update && \ + apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml From patchwork Thu Jun 28 16:46:37 2018 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: 936268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CcvwS8Xj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gm671mGrz9ryk for ; Fri, 29 Jun 2018 02:52:15 +1000 (AEST) Received: from localhost ([::1]:37614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa9U-00022y-U7 for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 12:52:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa4Z-0007Di-GJ for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa4W-0003uc-FG for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:07 -0400 Received: from mail-qt0-x229.google.com ([2607:f8b0:400d:c0d::229]:40133) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa4W-0003u3-9s for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:04 -0400 Received: by mail-qt0-x229.google.com with SMTP id s47-v6so5314974qth.7 for ; Thu, 28 Jun 2018 09:47:04 -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=iXVf63dz5WOl4W1QAxDPwb375sY8xPNd4kJc4BJ4xxs=; b=CcvwS8XjgRVh4yPNtTlXpUllqEZ+8fHjwdDZViLRxikI8OAVCWAAn4u11fo8PrRqwk 9ZweJfXUvQwRx1BaepOdjyGvJ3GKDvkm9U1+9BqLuXcw1oMDBpJvLRrPPOB1n384W+sr 8XhfEAihZRXMhAnINJeWmNa8Gm09tnP1rKGMcZd3ozI0jHeUsPhNLFwiO2TEZO1Gcyd/ sKaD57+oOAMfygFVJiVaipcb8im7gbKlJTVxjEHQYLRwpXbgvOEPdT2vZI1WbGwoxTQG 0X4bc3kMQUZGtTduqjYUmYNziOOsk8qNSAQf+e+u05PlYEDkk12koe+kHyBA1CFQDKcO XAjQ== 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=iXVf63dz5WOl4W1QAxDPwb375sY8xPNd4kJc4BJ4xxs=; b=HOzTtatMAnX5UX5CFCAnqHLxPllsyh73pViaPQ4omcYq6RbWXqRAU6z29ZDllF1jfo +YS2pti4HkFZRiXYCmtB0yuQrbUqIYAX+g5C0mIPVIkLj90t2OeZusneDA/CQ3L7qunA GwHfLQ2ma8RgDCxByifvWctCd4P9lHhdyc3WgsakP1Qu1J4w+CQwfZSUXd9P2Tx/CsYN 8/5HM5ewv5yfYpcybHzV+sL5XG36vx+8W7glfnXaZpuMNJPnfQNdHMuSBZYG1ZQrMOrI Gb+TbHdPyZELVgYz33gM90Cge6TvkJQab5k+/B0eKLiy/3xJMtWDsnelHn+8vq4jv/HZ CJxA== X-Gm-Message-State: APt69E2jQL1jH4JdCPWWn0WQcjHETIGjbycndQ3IQMvuQfZw6YH5uozA ZfGjjqL+8JA5UpGSt/UG3q4= X-Google-Smtp-Source: AAOMgpcXSJ8yhByGk0FMVpaIH9H/3SgxrZ7c235syTGq/R/rVIwu6tjsjZHCaKR8CmcosWq5RGw00A== X-Received: by 2002:ac8:41d3:: with SMTP id o19-v6mr10195449qtm.265.1530204423713; Thu, 28 Jun 2018 09:47:03 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.46.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:47:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?b?w6k=?= Date: Thu, 28 Jun 2018 13:46:37 -0300 Message-Id: <20180628164643.9668-3-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-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::229 Subject: [Qemu-devel] [PATCH 2/8] docker: ubuntu: Use SDL2 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_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Do not test the deprecated API versions (see cabd35840749d). Debian MXE MinGW cross images are already using SDL2. Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/ubuntu.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index c03520ce3f..7d724e7f53 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -5,7 +5,7 @@ ENV PACKAGES flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ libspice-protocol-dev libnss3-dev libfdt-dev \ - libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \ + libgtk-3-dev libvte-2.91-dev libsdl2-dev libpng12-dev libpixman-1-dev \ libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \ libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \ libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \ @@ -15,4 +15,4 @@ ENV PACKAGES flex bison \ RUN apt-get update && \ apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml +ENV FEATURES clang pyyaml sdl2 From patchwork Thu Jun 28 16:46:38 2018 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: 936254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EoU/AQny"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gm1G6FC2z9ryk for ; Fri, 29 Jun 2018 02:48:02 +1000 (AEST) Received: from localhost ([::1]:37596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa5Q-0007KI-DZ for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 12:48:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa4i-0007Ix-SN for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa4f-00048g-QD for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:16 -0400 Received: from mail-qk0-x229.google.com ([2607:f8b0:400d:c09::229]:41148) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa4f-00048D-Ky for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:13 -0400 Received: by mail-qk0-x229.google.com with SMTP id d22-v6so3349140qkc.8 for ; Thu, 28 Jun 2018 09:47:13 -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=7UQOLJxvCCKsJcG3Vzw/XfwvQlkN4g/TKe6EjBKUXns=; b=EoU/AQnygw7z6qqRCwR6tOyFaYWe8O/0Rnro3LnuZUwLBhA+eoVRfsKuIfN3mjyyTG JSsnJf0byJGjREnvvlcaVlfOM1OBF0yZA88+VEiZJBIc1Oodpcvrad0CP765XjP8cfdA 8QRGTQkFuQgoqlSDC92WOrzk1k0JkuCk+gMMz3Zbn6s4b4d2AV37s7b313mVHGmZpTWS FD90GhNjYVMuu0MoL45bPxj/BVeXHfhanDatj8en1xxNwWTgkZ/A5Il+nZUv6JEiMGlY 1pTKkiUEvzJSMvePHu6YVn7A0XpjbimHwKopitfmwz3Z6GcZY97rJpLJXofrbQVoyHSV +bRA== 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=7UQOLJxvCCKsJcG3Vzw/XfwvQlkN4g/TKe6EjBKUXns=; b=hlheTNuxjzU9y862NyAsTArd3oz1uMapCW725ig6a9g2o87IjJY9Y+yoCFyDPEvsRb p58xtnY/AFSnsTyIa3Dz4kOuy4soZhcvGPHwJG2FOQwnQU7KQ1sMc/WqpIVgNoTCR/bX FsnxmTH9TZ777hAUG4WvXZGdhj3Lzo25kpKOatH4nAnPmFE6hhydt7gUOyNNX8jxEWL8 5U58mp4VRsDR7MErQM3wnMbkz6EhKDcroGhxqilTEbcYOL4xi15WfvqfoCreWzD5WZG8 JtWTnsbWWpIkNcsfu8hSaxipOognc6DThcAIm2VBRYYy4165DCI1L02AtZi6MAnVS/BA x40g== X-Gm-Message-State: APt69E0Pg+4+BqoEpLeiN8vDVzA1cX6t/O4JztEgUEydsSK8KsaeF3ic 6bhIdmc1jBT1gnmzT/QSQJtIW/7m X-Google-Smtp-Source: AAOMgpe6ZOAB7PDOWf6Kze8MWvZyr4QBorlsyljpkbcgO9/LIlOQqBpGdqtudvtEyotTIff5TkNV0g== X-Received: by 2002:a37:2e46:: with SMTP id u67-v6mr9226851qkh.106.1530204433068; Thu, 28 Jun 2018 09:47:13 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.47.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:47:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng Date: Thu, 28 Jun 2018 13:46:38 -0300 Message-Id: <20180628164643.9668-4-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-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:c09::229 Subject: [Qemu-devel] [PATCH 3/8] docker: Clean the MXE base image 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_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Using the duplicated same package is confusing. Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- It would be even better to figure out what I wanted to do with this command and add a comment in the Dockerfile :) I think the original idea was to share the packages common to both gw32/gw64 images in this intermediate common image. tests/docker/dockerfiles/debian8-mxe.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian8-mxe.docker index 9b8e577b03..2df4cc8c5c 100644 --- a/tests/docker/dockerfiles/debian8-mxe.docker +++ b/tests/docker/dockerfiles/debian8-mxe.docker @@ -14,6 +14,6 @@ RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ libpython2.7-stdlib \ - $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) + $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) ENV PATH $PATH:/usr/lib/mxe/usr/bin/ From patchwork Thu Jun 28 16:46:39 2018 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: 936263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k5qQqS0N"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gm4R24nNz9s1B for ; Fri, 29 Jun 2018 02:50:47 +1000 (AEST) Received: from localhost ([::1]:37606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa85-0000rz-0j for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 12:50:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa4t-0007Oy-2C for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa4q-0004ZO-17 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:27 -0400 Received: from mail-qk0-x236.google.com ([2607:f8b0:400d:c09::236]:34141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa4p-0004YH-T2 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:23 -0400 Received: by mail-qk0-x236.google.com with SMTP id b66-v6so3350313qkj.1 for ; Thu, 28 Jun 2018 09:47:23 -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=nrb7rfyEYUtTMxrX8kXjkBn644tMi9GwApQtb83VJ9s=; b=k5qQqS0NJNNPW2YJ2xAa/o29up9tC9tk507pW0xBbifQlpGtYqxO/uBrr9XrWs2pZT OzUwNN8DOKdPwelPJ9pgj81eVUtK4xHBpU4FT5nJVmXc6M2mzb6XlN3zKxRXhseXzFRC D6nbLUedNgDiRrYt6eXcSqxBY+z25YqCrywP2JWsA6Vp9dqro+70w03SOTuGMUKB6zhd oKlSCcnFfDipi9THMFG5Rbtsu2wBKM/CMGXSfFxP7Av2CM9qcEd956SXFMhwAGMSE2zU qsoSI6GfY08v4z+bZjvFRut5+XCGQ23vzIg7uDw0VCPrZyh+K0EAd8Yg5EcL+dTCgSNA mqGA== 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=nrb7rfyEYUtTMxrX8kXjkBn644tMi9GwApQtb83VJ9s=; b=M27ym0qKfH0Y2EcFxSx9sJaB2nGh1KF6L3HqMt8ZeLv79MY/UnnvodBWRe4GB2Asm/ cnIJIOVPPXHWDqNV+3+gJL+nQaMRhxt0XuJNXvULOB4h1uJb/09j/UW9n9Y35LJR1pNs J7gzpzxv9yQFBMaE91VNWpmR+BUOONqHz9xFQSUTgQT0DbSPUUTpwA0OGI/s9HCnG5to QHUvUTD1R79g+dT6BeUDv3c15movek6wwUaB9GpG6YU9HWOe7AlSJiZT5G7V4ajh43UN idejK6pxdQN/XKG7Ou5CLlL0TdX6BHSW+yYMSpZiXrNU6ewxKq339GGXIBJyMequlISR GQCw== X-Gm-Message-State: APt69E3NkaNHAkqCzVQO52RP6cUceFhRaKhTtwUwWjBoDm2IxXUWxlBW 9fsw2Y2ngY53JPVDe9h0ayE= X-Google-Smtp-Source: AAOMgpdPulJLHmWhWy+G+8xU6/tHjtqXJN9RxJad8PV4Xp/8zwrpUoFhNr+McBuJvz9RY4NnfFNkaw== X-Received: by 2002:a37:6c46:: with SMTP id h67-v6mr9450227qkc.38.1530204443328; Thu, 28 Jun 2018 09:47:23 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.47.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:47:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , Cleber Rosa Date: Thu, 28 Jun 2018 13:46:39 -0300 Message-Id: <20180628164643.9668-5-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-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:c09::236 Subject: [Qemu-devel] [RFC PATCH 4/8] docker: Add packages required to build a Linux kernel 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?b?THVrw6HFoSBEb2t0b3I=?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Being able to also cross build Linux kernels with our docker cross images allow us to add more complex qemu-system acceptance tests. Signed-off-by: Philippe Mathieu-Daudé --- This is not required to build QEMU, so I might resend it in the acceptance-test series which actually requires this patch. tests/docker/dockerfiles/debian-sid.docker | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker index 9a3d168705..846021b032 100644 --- a/tests/docker/dockerfiles/debian-sid.docker +++ b/tests/docker/dockerfiles/debian-sid.docker @@ -22,11 +22,15 @@ RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ + binutils-multiarch \ build-essential \ ca-certificates \ + curl \ flex \ + gettext \ git \ + gnupg \ pkg-config \ psmisc \ - python \ + python-minimal \ texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } From patchwork Thu Jun 28 16:46:40 2018 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: 936255 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ddzq15+z"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gm1y6v50z9s3C for ; Fri, 29 Jun 2018 02:48:38 +1000 (AEST) Received: from localhost ([::1]:37597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa60-0007gv-Hv for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 12:48:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa4t-0007PN-GQ for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa4s-0004fj-KP for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:27 -0400 Received: from mail-qt0-x22f.google.com ([2607:f8b0:400d:c0d::22f]:46906) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa4s-0004ex-FP for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:26 -0400 Received: by mail-qt0-x22f.google.com with SMTP id h5-v6so5303297qtm.13 for ; Thu, 28 Jun 2018 09:47: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=B2Xh22n44ULSjI4IHjEMGgarlheNeNMuCDBOWx3+q5Q=; b=Ddzq15+zloUkOM/H/GleTzNO8l2P5Etb+pWug6rlv0rp1OzCa+GPoTccBuXdAFtQhb m8gO76QME4wjngM4SJQUW5UQivN6QrHf6gPGzFdEXVLKNP5AcoYkLlylGgmtTwETIRNI J23Gx2axt9S070lxHpiB1mGCRFwrZ3Wb/1NujUdIrXsqp2BI2lewcf+aXozHrMSZV2Ck e8yIg7Txc7Nz6Ldsp44sB4Y6sv78nq1ZugDcNNz98x89G6MgiE7bDfb3/My9a5yijaql oLRGUBHQkYuMnvqsfslA5vOvZGrdQGjIS2qHhst/jGDe5v9dKtB+BggrOb0JroVH1Nb0 Wypg== 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=B2Xh22n44ULSjI4IHjEMGgarlheNeNMuCDBOWx3+q5Q=; b=WI14hwzdbPlR546HYtUSVMfWYyjpNrkdqaNaUT0awgYwGcMaNXlphOE4f19vpJLiK4 q83KpYGNM9O/bysJ453Dleb8hK1xgqI9F3yMDL/0xXoQYu95Xw9TVuinRrlQVAogXz2b dMMmVumLVoQBugX1ltjJGKLpbcep4b+MNF2R/+WgwW0szm7P0rBcaU2khVpCpbSb9Kgw 6GaS2Cik7ugIVRXNW3IvQYeI1Lt/M6Bfr5iUJWoLgCfoWG3mkGkxzqtbwJXMeTGp1PpT dxoCi0yPOnY4BOANc6uJjgcJuUJgFON51Mw7kZ9vqR/bdUd6eeg8PIQBfTNyA2qHodNm Bm5A== X-Gm-Message-State: APt69E1BI/l2qKCa9tG/BtnYNsJdV7aj3NbuYK3k9NimM9yAL80SgX15 6UywENkN5CFU07tJhlkEk2A= X-Google-Smtp-Source: AAOMgpfUkGCSb8Q94QR7pVsxGCfSlOHz6Rz9743tcRGkDGozh9EXQxQkTuLO+36aZTVkCpbMy160aA== X-Received: by 2002:aed:3c2e:: with SMTP id t43-v6mr10146214qte.136.1530204445916; Thu, 28 Jun 2018 09:47:25 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.47.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:47:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng Date: Thu, 28 Jun 2018 13:46:40 -0300 Message-Id: <20180628164643.9668-6-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-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::22f Subject: [Qemu-devel] [RFC PATCH 5/8] docker: Restrict the 'travis' job to the Travis image 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_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We can still run any test in Travis. Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 91d9665517..7d9d568eee 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -99,11 +99,17 @@ docker-image-tricore-cross: docker-image-debian9 # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ - $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ + $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ + $(eval docker-test: docker-$t@$i) \ ) \ - $(foreach t,$(DOCKER_TESTS), \ +) +# we only run Travis tests on the Travis image +$(foreach i,travis, \ + $(foreach t,$(DOCKER_TOOLS), \ + $(eval .PHONY: docker-$t@$i) \ + $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ $(eval docker-test: docker-$t@$i) \ ) \ ) From patchwork Thu Jun 28 16:46:41 2018 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: 936271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ugEwYGAk"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gm6j3xdVz9ryk for ; Fri, 29 Jun 2018 02:52:44 +1000 (AEST) Received: from localhost ([::1]:37616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa9w-0002Kr-SJ for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 12:52:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa4w-0007RX-04 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa4v-0004lp-12 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:30 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:42907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa4u-0004ku-Sl for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:28 -0400 Received: by mail-qt0-x242.google.com with SMTP id y31-v6so5314464qty.9 for ; Thu, 28 Jun 2018 09:47:28 -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=8qraNdm823HDVkQ0rZmKCKTEA+7cIJbvC7DeIN1v4sg=; b=ugEwYGAkEQtY5iyeoWvDBjy22SJuUj0oZ6w3RaTK0hjWe0o2qeULttwr6Q+yjYcv0b kK0qr+QD1bgbp+tJ6ebl3b1huzEhUIwTV9I+79tCdX6jP1xPQ8MT+5GoX0Qun7hYwBBs cbbF9kogjDt1UlPN42G0cYVeekjAmNWWJDKXLIAMxDjwadm3G5zIcsLUloq0TzMb43tb evalE03YR0yQZIMI8TmezKKp0JeNySDD8cTx0Toyc1fJgFcvXJB29qMR6RmtR+IhzDqQ VpCp5qHZUFEs5KAWw4qUZmpM4C5RP8jfIqjEnrn0UNM2lK+x0NhX0Z5W5oP7fZ0Bl3DI zLXQ== 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=8qraNdm823HDVkQ0rZmKCKTEA+7cIJbvC7DeIN1v4sg=; b=HMCIS71RVlciEqhOUz4hVDx78w5Dz7lVGlDsEIval4bZM5/x6ir040aLq/ckwKrgQN ZNPaNDOeizaUyCdM9gcnkyMTGIXbueEBS0+QeFg62MY8dfsuRbGRux3SSpk9OXfah5eY x+PoTabfZGhYreG+shfBl5h3jQMPz0xL7U87/eZZhJp+HIuN329dnlF5+D6OUDExpoXb 4kUcV9p3tce+0MGNsYpelBSOKakK7ph9aWC964bAtInL7xe+K5P/uA3iUBTmva2xoOdv NG86kVpFMQzf1rTBAU1P0nfmTSy/uvmIpDAfKx05SOUDZf5rTmPrw4Y4trTb2Z9f71Q3 J5MA== X-Gm-Message-State: APt69E1ZHf65S5UpNgdgwCfsx3fOab7SIOqVXFwwJs/vM82nx8RUds3f WuyZx+jCA5B/ih/sJgmM5Kw= X-Google-Smtp-Source: AAOMgpeFS0wU1Q4PSIHI0RDmH0y6P3GFw0xgCxW9GrqWKoKyBak0UyU6c1RV9vOtxT+UX+lV25Pumg== X-Received: by 2002:ac8:3477:: with SMTP id v52-v6mr3851912qtb.316.1530204448326; Thu, 28 Jun 2018 09:47:28 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.47.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:47:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng Date: Thu, 28 Jun 2018 13:46:41 -0300 Message-Id: <20180628164643.9668-7-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-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::242 Subject: [Qemu-devel] [PATCH 6/8] docker: Do not run tests in 'intermediate' images 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_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We can still build the DOCKER_INTERMEDIATE_IMAGES images, but they won't appear in 'make test*@$IMAGE'. Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7d9d568eee..301ee68ae6 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,6 +5,8 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian +# we don't run tests on intermediate images (used as base by another image) +DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -98,7 +100,7 @@ docker-image-travis: NOUSER=1 docker-image-tricore-cross: docker-image-debian9 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ +$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ From patchwork Thu Jun 28 16:46:42 2018 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: 936277 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JiBa8aPi"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gm960X15z9s1B for ; Fri, 29 Jun 2018 02:54:50 +1000 (AEST) Received: from localhost ([::1]:37625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYaBz-0003j8-Oj for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 12:54:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa53-0007WT-T0 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa50-0004vB-N3 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:37 -0400 Received: from mail-qk0-x234.google.com ([2607:f8b0:400d:c09::234]:40426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa50-0004uG-Hs for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:34 -0400 Received: by mail-qk0-x234.google.com with SMTP id b129-v6so3345095qke.7 for ; Thu, 28 Jun 2018 09:47: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=GMSgOXfecZhTJMxSHLdUSUKtpVGDCSq9K0QIVmSdZoA=; b=JiBa8aPiDa2rbMcLN48Uu3KpJYCzFpMs6M/hIkYFvXKHx27AWbuaI4q14mBx5tkCWg J0LS6dKhKuxRTSyChA8m3dLvqOHwTflXyrOXAaE+OXDAWsMfNfynCoyLZ69LfuxDqlaa Xn833ecXO1AeBTex6DfAIURTE46sxO12xYrAvyjxUeRAvxu/Gk2ZZoR9JublQAZGcAvb L4jB5IeTv1EcOkgpde/VN4rhSQVfHjrIJYn2cCGxQtSX4NsjD+uERIX4x+aJQCztrvvA rVZFta+GIePA+HXz1YDTF2CzeUAjkCE2afRObFueFKaa0Q6XGudnVKaunLpqryz5MZS5 NgQg== 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=GMSgOXfecZhTJMxSHLdUSUKtpVGDCSq9K0QIVmSdZoA=; b=Bmwzn+QIkgKT81qWofMiZIEjT27YFkgS6uCeMns3CiNWvP5kDpEomjCqQy9sCM/HdH 2IInaBb4aci1X5NIgN2LVpd/MFZquYtvO9BGnCSmYrjcF007eNRQ+euvq3AGUaqXBtTx 0pA1w/ZK5zqMZ4kQ4czCZzZQMB+fk9tYqCW5lYZ0vLDbd6gAtWn4+LcJWDPKF2hY+Dw8 qN/Jn8Hn20dVrzmCpk39LgG2kCj/9G1mvfAun/SMoPM+LPYIhn7amSzAPloNYLU7xva3 4mgDw2ETonFKUph5xqA7Zi5AbvzKYphbaFWOaCZ2P1CCTyltd/z8iFSbSS1gl2dx62UN XRhQ== X-Gm-Message-State: APt69E1lTtgYn3rvDW8jmNPv9dw1ijPYqkT/Lj5nEtP18Xd4R1VwGtj5 VTnbdTbT1hJh+oyikieBzsM= X-Google-Smtp-Source: AAOMgpfzv85jv2OrhYp0CucSYO8DiwG8SJotf7wtp6g975lvIjbkOwZe/07LBPbOd14pf0PHQkzK1w== X-Received: by 2002:a37:7207:: with SMTP id n7-v6mr9249097qkc.175.1530204453937; Thu, 28 Jun 2018 09:47:33 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.47.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:47:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , Thomas Huth Date: Thu, 28 Jun 2018 13:46:42 -0300 Message-Id: <20180628164643.9668-8-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-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:c09::234 Subject: [Qemu-devel] [PATCH 7/8] docker: Cross build QEMU on ppc32 hosts 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_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since 08f56d8c9c the powerpc-cross image is no more based on Emdebian but on the Sid release. This patch restore the ability to cross build QEMU on powerpc, which is interesting since it is a 32-bit host. The ugly apt-fake script is, however, still required. Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 2 + tests/docker/dockerfiles/debian-apt-fake.sh | 46 +++++++++++++++++++ .../dockerfiles/debian-powerpc-cross.docker | 43 +++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100755 tests/docker/dockerfiles/debian-apt-fake.sh diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 301ee68ae6..d73d60cfbb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -58,6 +58,8 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker "BUILD","$*") endif +docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh + # Enforce dependencies for composite images docker-image-debian: docker-image-debian9 docker-image-debian8-mxe: docker-image-debian8 diff --git a/tests/docker/dockerfiles/debian-apt-fake.sh b/tests/docker/dockerfiles/debian-apt-fake.sh new file mode 100755 index 0000000000..2ec0fdf47a --- /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 --force-overwrite $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-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker index 5e62ca0df1..4ccd17d9d5 100644 --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker @@ -11,3 +11,46 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ gcc-powerpc-linux-gnu \ libc6-dev-powerpc-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } + +# Setup some basic tools we need +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + bison \ + binutils-multiarch \ + build-essential \ + ca-certificates \ + curl \ + flex \ + gettext \ + git \ + gnupg \ + pkg-config \ + python-minimal + +RUN dpkg --add-architecture powerpc && \ + apt-get update + +ENV PKG_CONFIG_PATH /usr/lib/powerpc-linux-gnu/pkgconfig + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc-linux-gnu- + +# to fix "following packages have unmet dependencies" ... +ADD debian-apt-fake.sh /usr/local/bin/apt-fake +RUN apt-get install -y --no-install-recommends \ + equivs +RUN apt-fake install \ + glusterfs-common:powerpc=4.0.2-fake +# + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get build-dep -yy -a powerpc qemu +RUN DEBIAN_FRONTEND=noninteractive \ + apt-get install -y --no-install-recommends \ + glusterfs-common:powerpc \ + libbz2-dev:powerpc \ + liblzo2-dev:powerpc \ + libncursesw5-dev:powerpc \ + libnfs-dev:powerpc \ + librdmacm-dev:powerpc \ + libsnappy-dev:powerpc From patchwork Thu Jun 28 16:46:43 2018 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: 936276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uxKBSaUE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Gm8S600jz9ryk for ; Fri, 29 Jun 2018 02:54:16 +1000 (AEST) Received: from localhost ([::1]:37623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYaBS-0003Je-Hi for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 12:54:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa54-0007Wi-5K for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa53-0004yz-Ar for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:38 -0400 Received: from mail-qt0-x231.google.com ([2607:f8b0:400d:c0d::231]:40143) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa53-0004yV-6Y for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:37 -0400 Received: by mail-qt0-x231.google.com with SMTP id s47-v6so5316589qth.7 for ; Thu, 28 Jun 2018 09:47:37 -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=QQJPSWyccNVQJieCrgjzetKq8IAJKdfAn4rI+gWFKzg=; b=uxKBSaUEyjouOgOm5EXPW3zSDECYcNO+szPgL51sXxsDUCbyaAX2swXy3107JnGIqU Wd2Wze4wD4NzU3whPiAHefQtEYx87oKv36zUzUrRwdS7hPclTM7hO11ud5d1dRPGxTR6 EZzb5HprEl0sNGaAEQLs9GyRtbuvqB4W5VsM0y2k4rs7mcmXRGplTsSnlStduQNWEYnU 9b9gtTpa4CaBPQm9muRqSIynFPpVGmvMCyGebhxLD6DRx6u8ZY7bX0VcdyaSSuu6K9Ob sCY1El+L8a+cDWeayIBxG4P2xgL1Sja1djRD33huZh5aNasX+XIdtT1dzYrg4NzGNQTn wYEA== 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=QQJPSWyccNVQJieCrgjzetKq8IAJKdfAn4rI+gWFKzg=; b=plcKveWhfwEzCK2DHdmSAyPOVx8v8tpG39q1+8F5Rvs8zTQfT+Qh8EHmsrfdut3Bdw TAgjTCz3OCjYNU/9zo47soSKgrke0LRZverN/TNiw4NkngywZ/MpqPxP4rA2udv0O2AQ ns3dtns3NP4Od828DICVTtFFJhJeNEB/es9nOdnR3dc896I+D7fMoWF/0NXMB9JI30ar 95G6J8xlmhOFn3dcCrPDPY/q0M0rWG6FTk2X33hYBXpo8QOaazZL7cEVHSqhMcLMrnN5 1ym3C07FLwOcky+uRn/bhNSJBumsY4gi68vAuz2YQT2N6qg3wdocAubkxp2NnLEgjrLX zLBA== X-Gm-Message-State: APt69E0LtYQClcNXlAaGyFcbHdaUnvlxoAb35RNkVgERdTRJIF5XI7sj Lkqaf9Ex1IeeKhjRypkGcATrIv/e X-Google-Smtp-Source: AAOMgpfc31B5fEkleBRaj5ezoTcV3CnDVUidP68MyQgldRyj6GRiLp4DqVNZKGeiKdQMQtGdry/TJA== X-Received: by 2002:ac8:18b5:: with SMTP id s50-v6mr9812673qtj.157.1530204456633; Thu, 28 Jun 2018 09:47:36 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.47.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:47:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , Thomas Huth Date: Thu, 28 Jun 2018 13:46:43 -0300 Message-Id: <20180628164643.9668-9-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-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::231 Subject: [Qemu-devel] [PATCH 8/8] .shippable.yml: Restore the powerpc-cross image 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_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This reverts commit b2dba411cf5afc6771e0dd9900fa2b5031a686ac. Signed-off-by: Philippe Mathieu-Daudé --- .shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.shippable.yml b/.shippable.yml index f74a3de3ff..e907a4addd 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -23,6 +23,8 @@ env: TARGET_LIST=mips-softmmu,mipsel-linux-user - IMAGE=debian-mips64el-cross TARGET_LIST=mips64el-softmmu,mips64el-linux-user + - IMAGE=debian-powerpc-cross + TARGET_LIST=ppc-softmmu,ppcemb-softmmu,ppc-linux-user - IMAGE=debian-ppc64el-cross TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user build: