From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B80E0CA9EA0 for ; Fri, 25 Oct 2019 07:32:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8936220867 for ; Fri, 25 Oct 2019 07:32:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="baJW9X1q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8936220867 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNu4o-00069x-LZ for qemu-devel@archiver.kernel.org; Fri, 25 Oct 2019 03:32:02 -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-Google-Smtp-Source: APXvYqw0TDT2PUFKpdNRBZqgUio9fr0+furuXLOzj62c3JEcJ1P+HUToB0oR7olapeyTB+yVxuwnpA== 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=20Benn=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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 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 -- 2.20.1