From patchwork Fri Jul 5 08:40:08 2024 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: 810357 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp1507842wru; Fri, 5 Jul 2024 01:42:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFUnHYJ5yXSSOGRWUeJbFryQy1uzeunsC138KQ4vo4ZPvH02vkAWtfng8gkjAPuLxyrixXPYVDvK79r1470SWX X-Google-Smtp-Source: AGHT+IHHGp0hMrTRMRU+rD+H5M2b8La1nMZ6ZPD5go1ic9ZtBWQMiHd/LjQfzYTZJsAxPOFS+2xN X-Received: by 2002:a2e:7e02:0:b0:2ec:5277:e5ab with SMTP id 38308e7fff4ca-2ee8ee158fcmr24924521fa.52.1720168967601; Fri, 05 Jul 2024 01:42:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720168967; cv=none; d=google.com; s=arc-20160816; b=RqQGLkz8ASAPF+X8hMO/CINmbo89xO3NvsNajFwDxn79+LS55zhYP4hoEGpI80BPxv bQ3Vap0JYwb84b2+eFBUyTe5BdRK/3cRxnxKY5doZsuf0JQEk5M6XeNnbIWZWXTMQaj9 cVMrME18YYYAjmu9mDJ8SXr5zX+ye6zmp8+P7Jr6bP/YOsvyUYuHPfet7FxeAOv4cXzh nbPmkXptonwwUPTQSoKU1R7EH1nQyrojquR6AEo9vzwupY05mVS7rOd7ZoDgz8EqKDEe UP5mbdwd2hnSwnoWEvP/C/RR+YyH/QD9KxBDfbgYYkYD7pVo9Zh9lTpNaKLvBj/f/r8Y Ht1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=0F1ubdjTjfUgOjFoVtYGFPGbIziBRq1wNHSOYJr4Cqo=; fh=fOmDb3LWEc8YYk2jJaPNBibuO+xI4aDvcJfVffKo+VU=; b=oTJzznxr8ASgiPWOK0QF/fVX1bK4Y9T+WjogtV3fPiTMZ3zbLI0ucFwwvXF/d0RM3g xfp6DpiZkEQ8MR4pY+ANtiV1841cdbDwRZhgu13KIAP+nQO7J7b3mz6N7yVrYlNyNS6h ovnDB/bW7c2+bofIQPTibeMzGq5MPeKRAbUAFfZr4DkXzqg+AnjKtQVDf1gDRKLDy5To Krquw+G5j9l8i9lhLf9zytYyG0qCitwM4Z8NIeS+ueFp2BxtzfpX0kBzysGvxpwYmMhx dv+kuaiUrDdSzmFsYieEDp/9FsRoDEifqrQ9/n4PUNZJeYh9VXvl42qZTZymMrKUu2cG HxAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T0alJLfw; 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=pass (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 ffacd0b85a97d-367952373f9si3019563f8f.988.2024.07.05.01.42.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jul 2024 01:42:47 -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=pass header.i=@linaro.org header.s=google header.b=T0alJLfw; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPeV2-0008Tp-JY; Fri, 05 Jul 2024 04:41:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPeV0-0008Q2-7L for qemu-devel@nongnu.org; Fri, 05 Jul 2024 04:40:58 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPeUv-0003Aj-Dw for qemu-devel@nongnu.org; Fri, 05 Jul 2024 04:40:57 -0400 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-58b0dddab8cso2259777a12.0 for ; Fri, 05 Jul 2024 01:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720168850; x=1720773650; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0F1ubdjTjfUgOjFoVtYGFPGbIziBRq1wNHSOYJr4Cqo=; b=T0alJLfwWI7MZDT8YXo9MU695xBz8ct2IHYZ4eQ6NGR2phNvQCWTjJrCVBmwKJbR8e FU+6bZIhSFclENE2ghVmSyla5qj5ZxMRO8Lk4rt6r4sNGR8DbZe/bBuRDP26JsIJFGyy xXeHbkNsmzOsDsiAyMEU6CFerQkueorPwq6aqVl2Ng9wwarvbhpn3rOw/uiMEkxmW3gT HYecYY/UbSCDSQoumE6r6Sw78txq0T58M+CtQ9oAZKXea3Kz1a5O9eKhuWX57DvZAbaV fLfDti3/0Jz1mnz9aFvZClVyNBbElkC7bPv/pBOFX9oQSEr50crPCpQU3KUoxiuwKO+u sWiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720168850; x=1720773650; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0F1ubdjTjfUgOjFoVtYGFPGbIziBRq1wNHSOYJr4Cqo=; b=TTYKKh94aGYnsgnxHJFQH5Kje0Pq8GEql+Ojwjs+Px71axREGlAm8kYP3gB0e1w5FG T4KQrLfIMyJVKiK0WhrT8G7H2+W0SUkomWTAkocvXaux55BER/TMHjChS1/kLqEe2xJG ah7zh9jwxib25mXe2Xi8G9Vjp8NcMJ0uGZ4EYVh5Wk6Ihv1XW4lFeGpZQ+nUHgtGWAQx uOEtxbAbHE+BtXnUrMPGZyU0qCPDm3PCIXCxC8oFPublYqMTLJwJz8WbmX7UknNMZ50a 2VwLoFEUP2tG4pZgfefoOGX4TwS5NZmDaZtn6hOx1WSE5IcG7o7CMPPPtGeCTMooP8VA 5yxA== X-Gm-Message-State: AOJu0YxZTrndpoCvJ3pb6xBzm1ERreO0ck0cnPQpvp+ryuxonWE/TMgm bU3Eld96IojbfsyWpne/zB7StKH5kE6pOk8gYLv4KpZseCvg1jpv12ArGl1DsWA= X-Received: by 2002:a05:6402:1d4e:b0:57c:5fcf:b570 with SMTP id 4fb4d7f45d1cf-58e5aecb1d7mr2823840a12.32.1720168849351; Fri, 05 Jul 2024 01:40:49 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-58cb2b83380sm3333502a12.74.2024.07.05.01.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jul 2024 01:40:48 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C44435F8AF; Fri, 5 Jul 2024 09:40:47 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Beraldo Leal , David Hildenbrand , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Alexandre Iooss , Thomas Huth , Mahmoud Mandour , Peter Maydell , qemu-arm@nongnu.org, Aleksandar Rikalo , Mads Ynddal , Yanan Wang , Eduardo Habkost , Peter Xu , Richard Henderson , Marcel Apfelbaum , Paul Burton , Stefan Hajnoczi , =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier Subject: [PATCH v2 01/40] tests/lcitool: fix debian-i686-cross toolchain prefix Date: Fri, 5 Jul 2024 09:40:08 +0100 Message-Id: <20240705084047.857176-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240705084047.857176-1-alex.bennee@linaro.org> References: <20240705084047.857176-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org I guess we never noticed and tried to build with this cross image. Fix the toolchain prefix so we actually build 32 bit images. Message-Id: <20240628124258.832466-2-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-i686-cross.docker | 2 +- tests/lcitool/refresh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index f1e5b0b877..f4ef054a2e 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -169,7 +169,7 @@ endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \ ENV ABI "i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-linux-gnu- +ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-linux-gnu- ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user # As a final step configure the user (if env is defined) ARG USER diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index b25e3ac4dd..ac803e34f1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -167,7 +167,7 @@ try: generate_dockerfile("debian-i686-cross", "debian-11", cross="i686", - trailer=cross_build("x86_64-linux-gnu-", + trailer=cross_build("i686-linux-gnu-", "x86_64-softmmu," "x86_64-linux-user," "i386-softmmu,i386-linux-user"))