From patchwork Thu Oct 24 10:22:39 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: 1182874 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Ve2Jy/MA"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 46zP2G6b4kz9sQr for ; Thu, 24 Oct 2019 21:42:13 +1100 (AEDT) Received: from localhost ([::1]:38390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNaZG-0004fy-0C for incoming@patchwork.ozlabs.org; Thu, 24 Oct 2019 06:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54038) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNaGe-0002Q7-7A for qemu-devel@nongnu.org; Thu, 24 Oct 2019 06:22:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNaGd-00049J-3f for qemu-devel@nongnu.org; Thu, 24 Oct 2019 06:22:56 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:33439) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNaGc-00048k-ST for qemu-devel@nongnu.org; Thu, 24 Oct 2019 06:22:55 -0400 Received: by mail-wm1-x343.google.com with SMTP id 6so1673037wmf.0 for ; Thu, 24 Oct 2019 03:22:54 -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=g2yjnFvogR+jOYTEWwruhPYFF18RK9D3ue14llssl0U=; b=Ve2Jy/MA1WY07XlKSkI/8bhuSPyA5vkxxp4Ld849yPxI/jhI17ccs0Gn9LgrfYmM24 h09qIDXU+6AwYYAy6br1YYRhKUGWa/RbtLkysTH2imOcTmZpoYjx/HYRgUVLO4CGS+GE f5x9GGsA+OO5+9TNS7QKUWyOAiT3tmV0dCXa+1uhHWzxz2lKGflyXjmabpBxWsR9ir3b WYSg/lsQIeLfulNzjfZoBW8E9izdgSZevdyOWpNlZHSbSxcGsbM92asgaZ7GDk5saMyO ix9/R8sIo1jMySfhEjPw6Yb2/cbJFECcG83RXOudh8mlfovwYeHH+7M0HmS5uoxnwRTw 6EIw== 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=g2yjnFvogR+jOYTEWwruhPYFF18RK9D3ue14llssl0U=; b=IhAsMTwz+fWD9Vh9Tc19KKh6PssAhUyI++gos676s97Z+xc5xVBMjY2edV/Ed7HUGa +424R+ItGlFb931HP+hPTwbCtgVFdmJC2hpUkNiM3iGq2uTGN3X4Y5S17/9j0hCCoRvb dakX7JXPwwyVDoSwcl7Uj6t0My2dzVzOmLJjA9dDrpy++ZwcdpXdqvvhynrvW/YxHfNw Gx6yQS6mJMle935kRSZyouM7XC0YUZOTerM+HxFvFs+PTY3DBE8eu2vAh6VMyjEzEhlb L80JlNwshUGpe81f2abdlrsEdln63Ftz0AKTkrc6lLSKhLDaj5t96/ViUvgg3JO/xOX/ 6o+w== X-Gm-Message-State: APjAAAVvYEe5cB/9lBswt8EGJ5VwEbkD7WyqJd8IG/YCR9D8LhGQ7BT/ 5uC+bjOlibsNm+r1C7RtFw1LSw== X-Google-Smtp-Source: APXvYqzHPTTnsEaZDfOGMnCuhEWz2oM6f+ynQmphyG/PzYC/9JPZ82unNy2BQ615sArohpPGVm0vWg== X-Received: by 2002:a1c:1d48:: with SMTP id d69mr3932656wmd.160.1571912573352; Thu, 24 Oct 2019 03:22:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c14sm19467162wru.24.2019.10.24.03.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 03:22:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C33A21FFA3; Thu, 24 Oct 2019 11:22:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 16/17] tests/docker: set HOST_ARCH if we don't have ARCH Date: Thu, 24 Oct 2019 11:22:39 +0100 Message-Id: <20191024102240.2778-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191024102240.2778-1-alex.bennee@linaro.org> References: <20191024102240.2778-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::343 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 --- .shippable.yml | 2 -- tests/docker/Makefile.include | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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