From patchwork Fri Oct 25 19:37:08 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: 177788 Delivered-To: patch@linaro.org Received: by 2002:a92:c74e:0:0:0:0:0 with SMTP id y14csp316943ilp; Fri, 25 Oct 2019 13:07:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqy73/zok/xbNXkF0N8t6QOWAFb/rpk674VgP0pHPRZ+hHAWtLYbEOYI5fJ+8T4REu+4EJAs X-Received: by 2002:a17:906:3b4e:: with SMTP id h14mr5163951ejf.111.1572034065188; Fri, 25 Oct 2019 13:07:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572034065; cv=none; d=google.com; s=arc-20160816; b=WGNKAzUoJK8kWIz4tAKlPIRks33/Om30JuZXG+X5F+Vrlzcd7AkPSZMehmGI9G+Qos 52hmZ3NASmZkNE/A7LJDj70iptw8BTWRHb4qDbfnTM9znocz11kRnzkYawvxMrpPI5Gq ojK7LvI0cL7R7T8+dQ0Z8m0uRxxLskdPOHORuAOgWYvjoeQ8WdcdPSBcb4gZ+NYAWVxL 7RLNzR90tCb6GuRpKa78xB95an0KY4sMZKLMFwEzpWeJ+T1sN1OU29SSZY/6ppQmfiVk gqfmS1cZSKC2zfEFUvF6veILm5qhvbvdZ8ByarGY4g2aGVbSA0LXu9IRMQnExFGtTslw bQZQ== 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=V2ZpvwUl37qCCTvzP+kDyA8HMg1NmwCkTfDXgtN97/UP7z7vjy/0faT2xBKzsYBuse 2tFpkm3huFfuLfyI85ZXFlIZTDedwvLX1GuXFyJW414yr+dWl9E39f0DE/alOt/wS9OL HDYtd/6rvuSfFv+MV/L/wCf6A8RuOWCiZz+ldS6ngrBg7/s58kn1uEuBPvjHzmhVB21W rEfCVgtxpPi1Bb+PB88oP3qofWgL3uXjBe3E3SAlpFJgp0z4UAKYNtOZhee9QDka48tV QzMIqdb2TtBQxHCVBkNBfmSK2HfWVlEgMANXToAT3s71DH+OWz0ryWPuuxu7i0Hq0SvP 1ueg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zs7euPhp; 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 i24si1949759ejh.35.2019.10.25.13.07.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Oct 2019 13:07:45 -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=zs7euPhp; 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]:35774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO5s7-0002Od-N5 for patch@linaro.org; Fri, 25 Oct 2019 16:07:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57837) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO5Oj-0008Jd-Sd for qemu-devel@nongnu.org; Fri, 25 Oct 2019 15:37:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO5Oi-00039i-Bt for qemu-devel@nongnu.org; Fri, 25 Oct 2019 15:37:21 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:39434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iO5Oi-00039C-5s for qemu-devel@nongnu.org; Fri, 25 Oct 2019 15:37:20 -0400 Received: by mail-wr1-x42a.google.com with SMTP id a11so3615835wra.6 for ; Fri, 25 Oct 2019 12:37:20 -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=zs7euPhpqqqyVBRaUXjA4tZtv9vamuMDM+HN4eciZ9hs126H9PJjfh+rUUYqe/UaBn CKQfqaklZ2XnTdAd39SQkki3lEW1VGPMVVFMIhBPBfO4I5wAOWZ9eDlUvrjCuFjsdJ9N yagMd7YaRlfboQuBe8V34yYGGqQ8OMIElzESGY9cCytwmfuyD1nP5MZbEObpijlAUbGZ Z2GGvpiz1506bW3uezPzsBofZY3pNzi6FxDMyHqkygYkwKrpiQKf/kz8+luKVpKhcPSM bmf+Ux8GsOEJiCfuPdLSKJZBBAilW/eWII6o+9ek/wPj8rdsW76yBo0NaSjn/VgK6q9z p2Ig== 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=nLxjNyTbeYl0EgTq9PZZmhrQV4y7m9FhQoTW3iWPy0RP2mNIGyp+SbpWxMKDc4q3rs XhWgSbm+cx4CN5bc2MmIpaMZLrbDRWYfc3LlaUKKdfFEycFa+NmcPZZdVRpDRRT6RMPA vJLqGLfcUluJsOHCd4iVcNlUHhqZYSoAK3qFAVv3Hh89KmOMDbUTa4XLq0gDEaYl9EuE lPNMnYycxCQ+lu4KMhiKJQir+FsyqdsEl009iSJa1jH8ri5B+xwvfgk/0+/4OntcD5Ho ojKbiZFYAXE+pZ6aFKdgoFFDKZK80C7pifYW0OzH3qA/egeK1VEzjXZaey/IwZNlMLZP d7bw== X-Gm-Message-State: APjAAAXqsRnrBpAT5M2b+2nM3PoyJ38JbHUnhDzotPY2/RGVsgO9xteg S2QVslDMyJgAk8H3eUa2306wAA0H3vQ= X-Received: by 2002:adf:a4cf:: with SMTP id h15mr4445412wrb.222.1572032238998; Fri, 25 Oct 2019 12:37:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v128sm4161805wmb.14.2019.10.25.12.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 12:37:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AB1B11FF9E; Fri, 25 Oct 2019 20:37:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v3 14/15] tests/docker: set HOST_ARCH if we don't have ARCH Date: Fri, 25 Oct 2019 20:37:08 +0100 Message-Id: <20191025193709.28783-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191025193709.28783-1-alex.bennee@linaro.org> References: <20191025193709.28783-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::42a 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