From patchwork Tue Jan 24 14:33:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92362 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1742200qgi; Tue, 24 Jan 2017 06:36:06 -0800 (PST) X-Received: by 10.55.3.14 with SMTP id 14mr28662435qkd.86.1485268566099; Tue, 24 Jan 2017 06:36:06 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 83si13265712qks.109.2017.01.24.06.36.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:36:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2CZ-0005Vj-Hf for patch@linaro.org; Tue, 24 Jan 2017 09:36:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2AV-0004Wi-4a for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW2AT-0005Kd-Io for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:55 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:38772) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW2AT-0005KN-Ct for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:53 -0500 Received: by mail-wm0-x235.google.com with SMTP id r144so212045935wme.1 for ; Tue, 24 Jan 2017 06:33:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XpYbAVh6qCA1arDji47uAbDO1q1CPY8yXTlWvps7+M8=; b=cT/NOudkMbJxWS9b0WunRY4iytR06MfNRQPkT6GSzxA/3ZZmcWOKAPMY6hZipAuLi1 ZWKTEElF2PqilihWWc8X6QYii34TGlq/PhqB0Wb5DSqh2Nbhr7B0Il1dy46jv5VMQ9xg ag3Tp6I6brjXFCivJMki3K/aT3gQdRuKo0WKo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XpYbAVh6qCA1arDji47uAbDO1q1CPY8yXTlWvps7+M8=; b=h2qJWm3gkaTClmKg1jTueT9Awv646/+stAD3BVzn/lEquuhcGMxemQarPEsrCN38rX IjR2FEWdHC33+7k1bm8HZV1vlsLSNcHAkSC+9obpzZ7OEaaGJFnyWBdGPDSv975rcT/b 5PV6s5NokTdxTfYa2xTnAh6GKVyXCe39oTAesEvjPq4NOrQ+jMTREZYyeZgCZRaOxGe1 L04+Q7CBtOKsUE2/ARGj6h3i+8cde6icd+SCTuRpybzZSb17zrIzIiggZ6z3DnrmriWA 2/1nur9uSkV3wKUBxT9KX4DWF1UBKig9/P8LV25h40nyZjFNgf3dAIfNtoIqEW4Y/oSv IMPg== X-Gm-Message-State: AIkVDXKgMDKBmImoNSU2k8P5XIkGTHUCr55vrLacwMmWeEiObNnOTTUjFyz3WLIheT8uvBuq X-Received: by 10.223.160.132 with SMTP id m4mr33511299wrm.116.1485268432317; Tue, 24 Jan 2017 06:33:52 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o132sm26581800wmo.17.2017.01.24.06.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 06:33:48 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B08603E0494; Tue, 24 Jan 2017 14:33:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 24 Jan 2017 14:33:40 +0000 Message-Id: <20170124143346.22240-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170124143346.22240-1-alex.bennee@linaro.org> References: <20170124143346.22240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH v2 1/7] .travis.yml: don't specify CONFIG twice 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?Alex_Benn=C3=A9e?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.11.0 diff --git a/.travis.yml b/.travis.yml index d83e2d493b..3dc1e6439d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,8 +104,7 @@ matrix: - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - git submodule update --init --recursive # Trusty build with latest stable clang - - env: CONFIG="" - sudo: required + - sudo: required addons: dist: trusty language: generic From patchwork Tue Jan 24 14:33:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92367 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1730991obz; Tue, 24 Jan 2017 06:42:58 -0800 (PST) X-Received: by 10.55.19.142 with SMTP id 14mr29933896qkt.206.1485268978916; Tue, 24 Jan 2017 06:42:58 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x26si13286197qta.287.2017.01.24.06.42.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:42:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2JE-0003M3-9X for patch@linaro.org; Tue, 24 Jan 2017 09:42:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2AV-0004Wm-53 for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW2AS-0005KR-Sd for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:55 -0500 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:37800) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW2AS-0005K8-Ml for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:52 -0500 Received: by mail-wm0-x22e.google.com with SMTP id c206so212471227wme.0 for ; Tue, 24 Jan 2017 06:33:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ASRZLDdeu790oyg8sJe3F0lvl1M4p0j6X9S80iiy2Ug=; b=hvUa35iJBpDtoOzxpkhAUOwpJPe19Q+p8MD7iZ0qkSjFcJ3qjRz7d6ltB8gXuesvKG LgCT5jwhgdnioqUchfvxa5R2z9QvdFh0XuQr/0xYK7820nnnbSa+reOig+WYFz7rJBGo OBdndc1jjSg3ERUsoEjEhivwU/RwkL8AZBUec= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ASRZLDdeu790oyg8sJe3F0lvl1M4p0j6X9S80iiy2Ug=; b=BHgf+SUQ7HpXC97nm0ZQ42ichS7UGjvJrYrI4vVvlszG7hmNyGz33DNUTaik52UEnk CcNL9sjq1JxD882DXnl069dTtTdxsL2hH2OsZLT6Vjl31o3ZcEMiRnW2/A6jiyF8dZJg uXGvUDjFgznqDMdBuUIydnQLTm9i6Zt6bNF25IKqqRGlxIR1sdqRQqw0bCNTBy7/uxpN REd8M13kLVXtvXyUwyfR0yVrIFrVmACJUSf3oSUd6DffFBT5wH2I2I8ovIXYSfVWGkn4 TV6rcZNuxr8lMCWML8EZaOx+OsB9oNR4h7S1vAzYASgJLJJa2/2+YniQaip62hNkolY2 sTmw== X-Gm-Message-State: AIkVDXJTZXG0KHArOBxDR+rmR1ufoMS22CRZDQtoSnkcC4XvDM7ZnAstgFmBsoNMZDly0J3A X-Received: by 10.223.161.74 with SMTP id r10mr11230181wrr.16.1485268431587; Tue, 24 Jan 2017 06:33:51 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y127sm26554271wmg.12.2017.01.24.06.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 06:33:48 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C180A3E0632; Tue, 24 Jan 2017 14:33:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 24 Jan 2017 14:33:41 +0000 Message-Id: <20170124143346.22240-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170124143346.22240-1-alex.bennee@linaro.org> References: <20170124143346.22240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22e Subject: [Qemu-devel] [PATCH v2 2/7] .travis.yml: split VM based builds 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?Alex_Benn=C3=A9e?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The Trusty based builds run a little slower than the main container based ones. This is also true for the latest version of Clang. The builds are getting very close (and occasionally run over) the 50 minute timeout. Rather than partitioning by target I just split them into linux-user and system builds. Signed-off-by: Alex Bennée --- .travis.yml | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) -- 2.11.0 diff --git a/.travis.yml b/.travis.yml index 3dc1e6439d..9008a796f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,8 +92,19 @@ matrix: - env: CONFIG="" os: osx compiler: clang - # Plain Trusty Build - - env: CONFIG="" + # Plain Trusty System Build + - env: CONFIG="--disable-linux-user" + sudo: required + addons: + dist: trusty + compiler: gcc + before_install: + - sudo apt-get update -qq + - sudo apt-get build-dep -qq qemu + - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ + - git submodule update --init --recursive + # Plain Trusty Linux User Build + - env: CONFIG="--disable-system" sudo: required addons: dist: trusty @@ -103,7 +114,26 @@ matrix: - sudo apt-get build-dep -qq qemu - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - git submodule update --init --recursive - # Trusty build with latest stable clang + # Trusty System build with latest stable clang + - sudo: required + addons: + dist: trusty + language: generic + compiler: none + env: + - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9 + - CONFIG="--disable-linux-user --cc=clang-3.9 --cxx=clang++-3.9" + before_install: + - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - + - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main' + - sudo apt-get update -qq + - sudo apt-get install -qq -y clang-3.9 + - sudo apt-get build-dep -qq qemu + - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ + - git submodule update --init --recursive + before_script: + - ./configure ${CONFIG} || cat config.log + # Trusty Linux User build with latest stable clang - sudo: required addons: dist: trusty @@ -111,7 +141,7 @@ matrix: compiler: none env: - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9 - - CONFIG="--cc=clang-3.9 --cxx=clang++-3.9" + - CONFIG="--disable-system --cc=clang-3.9 --cxx=clang++-3.9" before_install: - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main' From patchwork Tue Jan 24 14:33:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92365 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1743818qgi; Tue, 24 Jan 2017 06:39:53 -0800 (PST) X-Received: by 10.55.24.8 with SMTP id j8mr31650430qkh.181.1485268793548; Tue, 24 Jan 2017 06:39:53 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p35si13299730qtd.35.2017.01.24.06.39.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:39:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2GE-0000QL-Tx for patch@linaro.org; Tue, 24 Jan 2017 09:39:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2AV-0004Wn-5D for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW2AS-0005K5-0r for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:55 -0500 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:38735) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW2AR-0005Jl-Qe for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:51 -0500 Received: by mail-wm0-x22b.google.com with SMTP id r144so212043383wme.1 for ; Tue, 24 Jan 2017 06:33:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2eCUwUdLiody9VmO0UIj4yOHDmfsWSx+MZp7SbDmhwE=; b=XXWxROrPcksr3inOWt9+8pd35H2FDauaUEeEPyeaKAmZ7XwxzWH/0v7xaV5OvYlnv/ /EcVGwoxgB58hTYS6+YigAXgnU7oGYSyTJB5lG8quSS7XVyaNGXDelYJ0lBtdPNQZi2C ZiGdRgi3/Aqmhv1uCrfa25aiMVH6GBupWQoKM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2eCUwUdLiody9VmO0UIj4yOHDmfsWSx+MZp7SbDmhwE=; b=phPrjdH+6isOxo28GChpWrNMi/VP2KVmz2hyuj0VB/STAPbIw7j1qhZPMMoCE/tAla vnYfmGeqtDDS9lG4FiV7BX9d4mFZE6oJyNWv2n9js1BFbqHPB7JaFBuEFSNKSxjX00As 4EaDKEy4we3hi5LTHbKq1E1NBEaiDzZ4bOIVPWb59iXtnd0VRFAyhyIoRgNoGeYqgmGb 4TkODLFpjCoCrnaPrugYjAVLaSrRqPbvfg2DhG6t/2+fd5WX9KM+1IY9csgZLC4m8Ykx csYvI2eh89czKYFvQL3FcpQXSmjaLAoL1A3gH+QKtu0xP3dWCymP7q2AyGQb9cEVXxLp ciiQ== X-Gm-Message-State: AIkVDXLXD9CWYZIQPHYsMfMbnQxGsCT3mVxSUDatqze6oBLSCQmxD0KsHG6rw0GYNuVqQPw1 X-Received: by 10.223.142.111 with SMTP id n102mr27711529wrb.11.1485268429042; Tue, 24 Jan 2017 06:33:49 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h75sm20245109wrh.37.2017.01.24.06.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 06:33:48 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D24233E2A53; Tue, 24 Jan 2017 14:33:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 24 Jan 2017 14:33:42 +0000 Message-Id: <20170124143346.22240-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170124143346.22240-1-alex.bennee@linaro.org> References: <20170124143346.22240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PATCH v2 3/7] .travis.yml: DEBUG MacOSX build 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?Alex_Benn=C3=A9e?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently the MacOSX build is failing. Dump some information to help with figuring out what has gone wrong. Signed-off-by: Alex Bennée --- .travis.yml | 1 + 1 file changed, 1 insertion(+) -- 2.11.0 diff --git a/.travis.yml b/.travis.yml index 9008a796f0..a9ce215f42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,6 +92,7 @@ matrix: - env: CONFIG="" os: osx compiler: clang + script: make -j3 || cat qemu-options.texi && false # Plain Trusty System Build - env: CONFIG="--disable-linux-user" sudo: required From patchwork Tue Jan 24 14:33:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92361 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1742196qgi; Tue, 24 Jan 2017 06:36:05 -0800 (PST) X-Received: by 10.200.47.53 with SMTP id j50mr28402619qta.273.1485268565506; Tue, 24 Jan 2017 06:36:05 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y36si13278730qty.52.2017.01.24.06.36.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:36:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2CZ-0005UP-3r for patch@linaro.org; Tue, 24 Jan 2017 09:36:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2AV-0004Wk-4n for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW2AT-0005KX-Bi for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:55 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:38750) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW2AT-0005Ju-5I for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:53 -0500 Received: by mail-wm0-x231.google.com with SMTP id r144so212044459wme.1 for ; Tue, 24 Jan 2017 06:33:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/31ErjBMLUr0AjFulCdIlAOPy57M8+zDHyLUAWxaYJ8=; b=dViqyxb5oWC2mA8ron5v3gz+NGw4JyFBCNLqannIxbDRyKpvlJZ7L83imiHZaRw2Em b/oLk1LSAG57WZYer3ft3sQPyTguAFko5+yOn+4iDmuGyaPVagUTIfP2tG5TioXHMtRa FaxFeVItNK9mzKeBdsi0PwGG7WcxRgd9ZOupk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/31ErjBMLUr0AjFulCdIlAOPy57M8+zDHyLUAWxaYJ8=; b=If7IJu3RykNMBW8DyQdO1wvZz64pARHpOmq+4VlbRiI58+bM2QHo17pSPhviIPkt9t igWqGEdjfhMUOetnwEzovto4S8laiBXfaMGqBHm0vAadifrddFPyv0RclIid4Mc/ceJ+ JRYoOhKCSmXKy6FNRQoR1q8uZfnvpI5kayCuyOEvKm4o17K5VWHypJAw5jR5c6VWEaCf fC5nmlyVqx+bBkf/rjKBnZ3gzsszLPzuK6yL6xwsVeMnEQHNrvjKfYADAMSgmVppT7Sx 9wjrG2tCt4pMMxGvOxfPc/WVmbkX8JJtqbiN9U780LZAc1cmf+mVgmXe6nH6YtJKTJMw 5Tpg== X-Gm-Message-State: AIkVDXKOgZdqr2LS/m9FKCEgey6m08HmrrmtOWedPgN32uAjyxLUo9CKb+mF1vUIUX57Z0qh X-Received: by 10.28.27.14 with SMTP id b14mr17286544wmb.82.1485268430346; Tue, 24 Jan 2017 06:33:50 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u47sm20285902wrb.15.2017.01.24.06.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 06:33:48 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E2B7C3E2A58; Tue, 24 Jan 2017 14:33:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 24 Jan 2017 14:33:43 +0000 Message-Id: <20170124143346.22240-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170124143346.22240-1-alex.bennee@linaro.org> References: <20170124143346.22240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PATCH v2 4/7] tests/docker: add basic user mapping support 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:All patches CC here" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently all docker builds are done by exporting a tarball to the docker container and running the build as the containers root user. Other use cases are possible however and it is possible to map a part of users file-system to the container. This is useful for example for doing cross-builds of arbitrary source trees. For this to work smoothly the container needs to have a user created that maps cleanly to the host system. This adds a -u option to the docker script so that: DEB_ARCH=armhf DEB_TYPE=stable ./tests/docker/docker.py build \ -u --include-executable=arm-linux-user/qemu-arm \ debian:armhf ./tests/docker/dockerfiles/debian-bootstrap.docker Will build a container that can then be run like: docker run --rm -it -v /home/alex/lsrc/qemu/risu.git/:/src \ --user=alex:alex -w /src/ debian:armhf \ sh -c "make clean && ./configure -s && make" Signed-off-by: Alex Bennée --- v2 - write the useradd directly - change long option to --add-current-user --- tests/docker/docker.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.11.0 Reviewed-by: Fam Zheng diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 37d83199e7..b85739a9e2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -25,6 +25,7 @@ import signal from tarfile import TarFile, TarInfo from StringIO import StringIO from shutil import copy, rmtree +from pwd import getpwuid DEVNULL = open(os.devnull, 'wb') @@ -149,13 +150,20 @@ class Docker(object): labels = json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") - def build_image(self, tag, docker_dir, dockerfile, quiet=True, argv=None): + def build_image(self, tag, docker_dir, dockerfile, + quiet=True, user=False, argv=None): if argv == None: argv = [] tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker") tmp_df.write(dockerfile) + if user: + uid = os.getuid() + uname = getpwuid(uid).pw_name + tmp_df.write("\n") + tmp_df.write("RUN useradd -u %d -U %s" % (uid, uname)) + tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % _text_checksum(dockerfile)) @@ -225,6 +233,9 @@ class BuildCommand(SubCommand): help="""Specify a binary that will be copied to the container together with all its dependent libraries""") + parser.add_argument("--add-current-user", "-u", dest="user", + action="store_true", + help="Add the current user to images passwd") parser.add_argument("tag", help="Image Tag") parser.add_argument("dockerfile", @@ -261,7 +272,7 @@ class BuildCommand(SubCommand): docker_dir) dkr.build_image(tag, docker_dir, dockerfile, - quiet=args.quiet, argv=argv) + quiet=args.quiet, user=args.user, argv=argv) rmtree(docker_dir) From patchwork Tue Jan 24 14:33:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92366 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1730087obz; Tue, 24 Jan 2017 06:41:01 -0800 (PST) X-Received: by 10.55.12.14 with SMTP id 14mr29453976qkm.308.1485268861782; Tue, 24 Jan 2017 06:41:01 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s49si13283774qtb.234.2017.01.24.06.41.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:41:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2HL-0001my-4b for patch@linaro.org; Tue, 24 Jan 2017 09:40:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2AX-0004Yt-2n for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:34:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW2AV-0005LU-KO for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:57 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:37838) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW2AV-0005L0-F0 for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:55 -0500 Received: by mail-wm0-x235.google.com with SMTP id c206so212473634wme.0 for ; Tue, 24 Jan 2017 06:33:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qQD+k13+K9ebMWVsjVPJFwwUWSC17AM+7tfDT8yACbI=; b=YU4AixVJp+/M9p26x4WAUjY71BTHfuj8SLRrxMs/BgTU6x1/xqElIubNXIFvwbuUNK N5TWlJde32OMzzlY1vI5B0SGyq71wPIcQXJAlqVAE5q9/wVktFYxt63BGoZfod1dQMPZ gchh8xjTUlAHTzOd3YV+bNiin62ByzAL2OpXo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qQD+k13+K9ebMWVsjVPJFwwUWSC17AM+7tfDT8yACbI=; b=MyPKRf7N0tm/FTGi5c6/Eucz6yIHk0aafMGPVrEbLsCfXBwCQc0K/YtdwrgAoYSHmc 1vFn/KqWxhks7isOw/SdJeTlfqYP+9GDosTGsOqR0dq4OyyX5zRFM04RlBMaFABSsl5g PaLbk9LNO49y7hKKW7oiFmvKWEx09I7mUBgamGIWbuVOz+O59Wh/Mfw0znQFcSovEpeu DKi7peMGW5vmA5/bdjkSh2h3apPpw47dMKlVcfMPc7e/pZlyEfsgKwUZMQrB+Zxu1VJB 7DD5hJZYrOR0QYwoC6h09fuIza3tcb5FYGz1ro/VGqnwGdNTUFnkSJTS676MN8mkiChe r5Ug== X-Gm-Message-State: AIkVDXI+8hxTarnhbud62nQZjE40AnCF666C12sQv5yVfggZ5b7qBCF43pVFpcq+gvmdWAXo X-Received: by 10.28.216.14 with SMTP id p14mr17081167wmg.56.1485268434413; Tue, 24 Jan 2017 06:33:54 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 10sm20141628wrw.13.2017.01.24.06.33.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 06:33:52 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F2EE43E2AAF; Tue, 24 Jan 2017 14:33:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 24 Jan 2017 14:33:44 +0000 Message-Id: <20170124143346.22240-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170124143346.22240-1-alex.bennee@linaro.org> References: <20170124143346.22240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH v2 5/7] new debian-multiarch-cross.docker: a cross-compiling docker guest 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:All patches CC here" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This provides a basic Debian install with access to the emdebian cross compilers for armhf, arm64, mipsel and ppc64el. On its own it provides the basic cross build essentials for building any of those architectures. More complex cross-compilations would need to install library dependencies on top of this image. An example use: docker run --rm -it \ -v /home/alex/lsrc/qemu/qemu.git/:/home/alex/lsrc/qemu/qemu.git/ \ --user=alex:alex \ -w /home/alex/lsrc/qemu/qemu.git/arm-linux-user/tests \ -e CROSS_CC="arm-linux-gnueabihf-gcc" \ debian:cross make -f ../../tests/tcg/arm/Makefile Signed-off-by: Alex Bennée --- v2 - add clang (keep shippable happy) - rm adduser code (done direct now) - add aptitude (useful for debugging package clashes) --- .../dockerfiles/debian-multiarch-cross.docker | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-multiarch-cross.docker -- 2.11.0 diff --git a/tests/docker/dockerfiles/debian-multiarch-cross.docker b/tests/docker/dockerfiles/debian-multiarch-cross.docker new file mode 100644 index 0000000000..749fdf07e1 --- /dev/null +++ b/tests/docker/dockerfiles/debian-multiarch-cross.docker @@ -0,0 +1,45 @@ +# +# Docker multiarch cross-compiler target +# +# This docker target is builds on Debian and Emdebian's cross compiler targets +# to build distro with a selection of cross compilers for building test binaries. +# +# This does not include the build dependancies for QEMU as there are +# so many there are unresolvable clashes. +# +FROM debian:stable-slim + +# Setup some basic tools we need +RUN apt update +RUN apt install -yy curl aptitude + +# 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 + +# Add the foriegn architectures we want +RUN dpkg --add-architecture armhf +RUN dpkg --add-architecture arm64 +RUN dpkg --add-architecture mipsel +RUN dpkg --add-architecture ppc64el + +#FIXME: Currently these cause clashes due to multi-arch being an ongoig process +#RUN dpkg --add-architecture mips +#RUN dpkg --add-architecture powerpc + +# Final update +RUN apt update + +# Install the crossbuild essential packages +# FIXME: crossbuild-essential-powerpc has a clash with '/lib/ld.so.1' +RUN apt install -yy clang crossbuild-essential-arm64 crossbuild-essential-armhf crossbuild-essential-mipsel crossbuild-essential-ppc64el + +# Before you can actually build something you need to install its build dependancies. +# This is best done in a child container as architecture specific -dev packages have a habit of clashing with +# each other because not everything is fully complient with the multiarch specififcation. +# +# To install the QEMU build dependacnies you need to run: +# RUN apt-get build-dep -yy -a armhf qemu From patchwork Tue Jan 24 14:33:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92363 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1742779qgi; Tue, 24 Jan 2017 06:37:26 -0800 (PST) X-Received: by 10.55.152.69 with SMTP id a66mr31063866qke.172.1485268646336; Tue, 24 Jan 2017 06:37:26 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c41si13265100qta.309.2017.01.24.06.37.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:37:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2Dr-0006dd-VD for patch@linaro.org; Tue, 24 Jan 2017 09:37:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2AV-0004Xf-FM for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:34:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW2AU-0005Kw-NM for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:55 -0500 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:38787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW2AU-0005Ki-Gy for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:54 -0500 Received: by mail-wm0-x22b.google.com with SMTP id r144so212046853wme.1 for ; Tue, 24 Jan 2017 06:33:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JBHU//ULxsYA2oLx8AbycAzs9rWZGGiSzanNJV6dXXQ=; b=Uluz74SArcvV9mi+ab3mtP1uw9CDMgic2oZouG3S8ByvV8Ab6bKjoLLI7452Xl5/dR fzzo79ps/YtA36pf1iFfHGEltz9c6lFM0fOiE4iXs/FG+s3U9Ywr+ZFyBPB83zFTxTDS CpZ3YMsAZFhGfV/+2dpeV85uNre6wRn6xTzJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JBHU//ULxsYA2oLx8AbycAzs9rWZGGiSzanNJV6dXXQ=; b=Pq7FTR6bEIm+tAN0Xf1r6D3qnDcUGjy3c6FW0Vt+aE5we6l3i7z9MUrldYpwvPrSoO LMHKGz5r5z5beWAl5L9sNcNR0b/iOJIHUuKHpNvSZ1CMHCJpIND7ptcTUYSk4hK8EI6j rYERRFDCfVULsDzYW0O/2Z0bnDE+kyy2IRGNdxSm4OiPN7U5Xl14LShLOJjpAW7fXwNf CxGcck9nWR7paNgqXboKTLhjk0R6+VfyH/jmgHEwPds+1kIaax90mClGLvTP6qy6kO1U TuvFGz6OisLz6ZDz+m9MkKj78CnIfSxScyfEsb8jU9GhsIWn/WK3r/n+VDjMISX3ayBh NxhQ== X-Gm-Message-State: AIkVDXJtY9ZqePKJ2JyoTZ0rXSau/ky6wQcEtNBKYMIwI5qisopNVH8VcThnlnK+tv+nNAMH X-Received: by 10.28.25.70 with SMTP id 67mr19692229wmz.125.1485268433474; Tue, 24 Jan 2017 06:33:53 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r6sm26693771wmd.4.2017.01.24.06.33.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 06:33:52 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 105873E30E1; Tue, 24 Jan 2017 14:33:47 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 24 Jan 2017 14:33:45 +0000 Message-Id: <20170124143346.22240-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170124143346.22240-1-alex.bennee@linaro.org> References: <20170124143346.22240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PATCH v2 6/7] .shippable.yml: new CI provider 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?Alex_Benn=C3=A9e?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Ostensibly Shippable offers a similar set of services as Travis. However they are focused on Container based work-flows so we can use our existing containers to run a few extra builds - in this case a bunch of cross-compiled targets on a Debian multiarch system. Signed-off-by: Alex Bennée --- .shippable.yml | 24 ++++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 25 insertions(+) create mode 100644 .shippable.yml -- 2.11.0 diff --git a/.shippable.yml b/.shippable.yml new file mode 100644 index 0000000000..10496acb7c --- /dev/null +++ b/.shippable.yml @@ -0,0 +1,24 @@ +language: c +env: + matrix: + - CROSS_ARCH=armhf CROSS_PREFIX=arm-linux-gnueabihf- + - CROSS_ARCH=arm64 CROSS_PREFIX=aarch64-linux-gnu- + - CROSS_ARCH=mipsel CROSS_PREFIX=mipsel-linux-gnu- + - CROSS_ARCH=ppc64el CROSS_PREFIX=powerpc64le-linux-gnu- +build: + pre_ci: + - mkdir -p docker-build + - cp ./tests/docker/dockerfiles/debian-multiarch-cross.docker docker-build/Dockerfile + - docker build -t debian-multiarch-cross:base docker-build + - echo -e "FROM debian-multiarch-cross:base\nRUN apt-get build-dep -a ${CROSS_ARCH} -qq qemu" | docker build -t debian-multiarch-cross:${CROSS_ARCH} - + pre_ci_boot: + image_name: debian-multiarch-cross + image_tag: ${CROSS_ARCH} + pull: false + options: "-e HOME=/root" + ci: + - env + - apt-get build-dep -a ${CROSS_ARCH} -qq qemu + - unset CC + - ./configure --cross-prefix=${CROSS_PREFIX} + - make -j2 diff --git a/MAINTAINERS b/MAINTAINERS index ad1000415d..5e7d1a7548 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1784,6 +1784,7 @@ M: Alex Bennée L: qemu-devel@nongnu.org S: Supported F: .travis.yml +F: .shippable.yml Documentation ------------- From patchwork Tue Jan 24 14:33:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92368 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1731381obz; Tue, 24 Jan 2017 06:43:50 -0800 (PST) X-Received: by 10.237.41.36 with SMTP id s33mr27841886qtd.139.1485269030675; Tue, 24 Jan 2017 06:43:50 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j200si12375320qke.129.2017.01.24.06.43.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:43:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2K3-0004Dx-5p for patch@linaro.org; Tue, 24 Jan 2017 09:43:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2AX-0004ZA-Cp for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:34:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW2AW-0005Lm-NK for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:57 -0500 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:36263) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW2AW-0005La-HB for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:56 -0500 Received: by mail-wm0-x22b.google.com with SMTP id c85so184601294wmi.1 for ; Tue, 24 Jan 2017 06:33:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vdh/DYvgK353k8qR3y4hZ2cflHFMS0y/HL8mZJIUyw0=; b=ghWMCmDyRS0TFr2uWIQVJwEzd+968iXwzlgkrFkCP2RqxHG/YuboGTCPh54Oxr093C S8fR8boOi9femLgDAijrlpGo8hDJu3t1KMXmjZE7uyMfQQ+9RKvMyzh1Pf6gGeTKrT7d uYVbKFeZIeWh+wa+OWmL7VcI+r/W4JW3l6a6k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vdh/DYvgK353k8qR3y4hZ2cflHFMS0y/HL8mZJIUyw0=; b=De2zMhqqwfLYUhFnnqsro/iIOQt2cpzelxiYCs9bOuqHpEnuHtLCvBMWXLFmnBPAKr 1laMSJ7TPe4RsMgBEsv8JZv0mXuWpJedxb+TxTNj8z2kf7RLHhbKdWm17sQ0scXKVne+ 30sO65n9sJcrU4sMv1RKlfpGu6IoYYPmXh8VJTxYlQh24gSN0Q+52PUYlAwOM0VCguEX bDBXtRBg9OhL9bdJ0guTTRdQU+rcGHjL0aCtOj7D0l73rzSLkSeRwdxs/Y5YkHTKR9IX 5r7SUQTjpsbQec64bQ3iZVHQ8gWBTVqgsCRL8S5qjtUamW79DC3/y49/JA6cN65DENu8 QTUg== X-Gm-Message-State: AIkVDXIYE+ZpLsLYkmQ1ZWW8uUv+zxDPCRmyGHzOBTyNa0vJqeHvLr4gURio+G/Gj2Qs7cbC X-Received: by 10.28.221.11 with SMTP id u11mr17386369wmg.75.1485268435549; Tue, 24 Jan 2017 06:33:55 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 202sm26676040wmp.20.2017.01.24.06.33.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 06:33:52 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2101A3E36CF; Tue, 24 Jan 2017 14:33:47 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 24 Jan 2017 14:33:46 +0000 Message-Id: <20170124143346.22240-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170124143346.22240-1-alex.bennee@linaro.org> References: <20170124143346.22240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PATCH v2 7/7] qemu-options: remove stray space 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?Alex_Benn=C3=A9e?= , "open list:All patches CC here" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- qemu-options.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 Reviewed-by: Fam Zheng diff --git a/qemu-options.hx b/qemu-options.hx index 80df52651a..55c68cecbb 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1705,7 +1705,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, " old way to initialize a host network interface\n" " (use the -netdev option if possible instead)\n", QEMU_ARCH_ALL) STEXI -@item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}] +@item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}][,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}] @findex -net Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n} = 0 is the default). The NIC is an e1000 by default on the PC