From patchwork Fri Oct 25 06:36:15 2019 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: 177680 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3286090ill; Fri, 25 Oct 2019 00:33:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPvF57M1P/qnsiSs8R1t9OTXOdEG+iv+Vf50Cw3u26eX38rmymvcCd9QVjSbq44byWHgzP X-Received: by 2002:aa7:cfcd:: with SMTP id r13mr2404576edy.146.1571988831983; Fri, 25 Oct 2019 00:33:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571988831; cv=none; d=google.com; s=arc-20160816; b=sB+JbLWye0ZuncmYVX87thdWXspjF2Rn1YR9Ptyn7PKht3zMjDpMLb264asKTsOlg5 r0hGV/liyfGJ6OJcLm1dzjLN9/KnWLJG8PO3wnUYzRYkxCjj6oYKMY3ddB3rTQOnE90q gNZhfCvipy8LOANldnelMWRXNqG4KfHi1guYfQHb6O/Qerodnb67G6Z70wOuMTcZ1CDE nP0V/o5hvvxWzs8kOcteSPLezzotevD8mwC79s1wVSkU+kI874LEZratiYr+UchvEDRk ubE+P2fttSnJVjTEytufMqzh/KZ95eERjwdeH16ymyflmL6Qsou0nskB6/pMrZTWfnJw QDnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5aMWHoUAPHVKIGtZD9kL4mkNdNLEvsYrFkunGwuaRjU=; b=Crm+6SOpTn/l/mijVffwXsHJjOSRf8P2k/fIVT0Btys699lonVvCvkN1N0XPlp7JcM d2Cz2jM0c2UxYw0bzCFAtIcIrW1MDeCFOUojFFnN1HgMQ9nobNXD0fAHmju+I7pja5xX Sc3mhD+2/U6TjLjXNV9ZxusfMEx7tvu8hgZJLhYkHmVjfmRwk99heiGHw9HuBbO+NeOX dnffjiNTsvegwvHBpg0a4MMeFAiludntC5XWtrG+7H5ERswbWeHEQTreV7O1uWUmfs6+ 8xCb9JAO44oz3wWT0AQa2I1cYaVZt+e9suNS2pKV0I6Sn/pfnMX3IZoCoEVGYn5L0SvW J6HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=baJW9X1q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x12si294925ejj.247.2019.10.25.00.33.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Oct 2019 00:33:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=baJW9X1q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:56872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNu6Y-0001No-5o for patch@linaro.org; Fri, 25 Oct 2019 03:33:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNtWX-0003GL-4Y for qemu-devel@nongnu.org; Fri, 25 Oct 2019 02:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNtWV-0007c9-VF for qemu-devel@nongnu.org; Fri, 25 Oct 2019 02:56:36 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39143) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNtWV-0007bB-P6 for qemu-devel@nongnu.org; Fri, 25 Oct 2019 02:56:35 -0400 Received: by mail-wr1-x42c.google.com with SMTP id a11so966874wra.6 for ; Thu, 24 Oct 2019 23:56:35 -0700 (PDT) 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=5aMWHoUAPHVKIGtZD9kL4mkNdNLEvsYrFkunGwuaRjU=; b=baJW9X1q2PsP+D1A+AAMaHbouFbEl87zioirgbS2MZAZWNkLaw7J1TwUhiYEO4FQyQ ImNNHmDzoPC5satXnWI8zLqfDMSFEUedmpx8CltG4I0ZjJnqix8aqd5vXTqeIAL/7u2f q1FXaJpIT4gCnJtnUBmyfLfUtUJvfW9dAL7+6BPbjDOiIrjcTLmBaSlzFWwbCEGWzo82 Arnz6mdDGFGs5pgo9TeXg95UjzC+rcSc3etJGe8dsHNsWVEZiaQwQwhfichrpitJHR4j +7TO60ZG5m7R/Y6/XlxrXxrOWne+azGpdbmZcRGdflawHqwJwaTa5I9ylNjJtLF/1ftS wUDQ== 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=5aMWHoUAPHVKIGtZD9kL4mkNdNLEvsYrFkunGwuaRjU=; b=mlpw1DDrkMuAnFAH3h7jZnUAV1xBDoCFcPjBO7/iUBaPwQqzag9C27Q5wfuVKMgeuW kJsi0TX9cPIiexOBiuI7opyrddQIZCOZiUhyMKA5UMq8ceAZ2gBepRmxyeBxDbKS7Ut/ 9ctff/aumFf6OaCsh1pUPePfsewWnSFthLUtFC32CIiHwTDI0zb94THEn4JtWb++d89G QtnZ4o5h7oqUXZi7SjIwKkDBb01KPqafu9M0QpL6NIGSXTki/haEcto4+pG3dpD7G4nk wV79VnE8P6wI4Ycf8oSVSeFOyKnWsCg3C/JKkrNlXOhtosRILWsgzmwDh4a+P7P58J2W a4vg== X-Gm-Message-State: APjAAAWUOfYBLW4dnvzkmCmps0TTKua0xS4wv0Ybg3tAdCaAVgGi73Yf 24urtKwsj2AOZzLJWBgbiQWtLw== X-Received: by 2002:a5d:4a8a:: with SMTP id o10mr1358573wrq.101.1571986594167; Thu, 24 Oct 2019 23:56:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z189sm2007437wmc.25.2019.10.24.23.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 23:56:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 119AA1FF9F; Fri, 25 Oct 2019 07:37:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 15/73] tests/docker: set HOST_ARCH if we don't have ARCH Date: Fri, 25 Oct 2019 07:36:15 +0100 Message-Id: <20191025063713.23374-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191025063713.23374-1-alex.bennee@linaro.org> References: <20191025063713.23374-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As the docker rules want to be able to be run on a virgin unconfigured checkout add a fallback and use it if we need to. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.shippable.yml b/.shippable.yml index bbc6f88510f..f74a3de3ffd 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -27,8 +27,6 @@ env: TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user build: pre_ci: - # usually host ARCH is set by configure - - echo "ARCH=$(uname -m)" > config-host.mak - make docker-image-${IMAGE} V=1 pre_ci_boot: image_name: qemu diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 89c56a3a88c..19dbe261699 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -2,6 +2,8 @@ .PHONY: docker docker-test docker-clean docker-image docker-qemu-src +HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m)) + DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) @@ -88,7 +90,7 @@ endif # Enforce dependencies for composite images docker-image-debian9-mxe: docker-image-debian9 -ifeq ($(ARCH),x86_64) +ifeq ($(HOST_ARCH),x86_64) docker-image-debian-amd64: docker-image-debian9 DOCKER_PARTIAL_IMAGES += debian-amd64-cross else @@ -106,7 +108,7 @@ docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe # For non-x86 hosts not all cross-compilers have been packaged -ifneq ($(ARCH),x86_64) +ifneq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross DOCKER_PARTIAL_IMAGES += debian-s390x-cross