From patchwork Fri Oct 1 15:33:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515036 Delivered-To: patch@linaro.org Received: by 2002:a02:606e:0:0:0:0:0 with SMTP id d46csp909006jaf; Fri, 1 Oct 2021 08:35:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz02WZZts0qFxxE+PBH4tlbqUoRpkIn0YZ6mI1/jzcfFpT7lHAvmcER513geF6O8lPkunVz X-Received: by 2002:a67:f5d2:: with SMTP id t18mr4779639vso.55.1633102507671; Fri, 01 Oct 2021 08:35:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633102507; cv=none; d=google.com; s=arc-20160816; b=xUAadTlP2+f6SFwIqyGepbx0RWFqpgeSR+de2YLhhk7BLObq18AiQ3yXlstxe50o/v cVsgaPLtOoeaaYN8+NIhw0FV20tl2n8wQPey7nSuuPy7//U1XS5Y31DlhN5+eWMOcIWU 22gPTOqu1snmjE71d/+4dHFsH2DZ4Zj8zJ0Jgm+27hIPNLnlC5V/EvPM5F++rZ1aRPFf kI5enGmQN+ryA7rGVAiMiR+A85xsnawq8r0sEAM32BMYI8xosuznsWRz1N3tueusV1VO j153rTAvi4A0UgJ9abd2oqrXDYci1q9NVywtfK3twRkEDsy6Bq/UbtrT0D1Yhzlx8xo+ RW/A== 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=77S8PHNNwp8gzL3C6UYKL3B8n68oD4JCUCVjCK3xRFU=; b=zv9mYRmMMeDtxdSvP9EKlh10ZfM2S8GjjwVDoVtI39ZkUVHUvng9Wiyp6KmnqkOdf5 W9ZS6nKn2d1sJfiEEDjwgOFnFnUxfDWHTqtLvx76ZlagHIlHMZjnqFwJri7NgjaHpFFi e9a7JVJGfMDo8deN/JJFqq/g+XSh0w90xRq3/j4D4VfAvgKHx40DgATp32ZSbj1kaHSN I6pUtifPDPW9YlF1XbRM6t6hYD7EagLWPNyVU45L3L+iAwN2pnCabJl5TAfwvelFQ0xT mEfMqCBMmKttbANlIJHBuXuMxJr6Yq5O65/OyUywBME2OWJcqDRQH0OUBOZJs7wdUN3o tPJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PxP9QKmV; 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 f9si3851810uam.231.2021.10.01.08.35.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Oct 2021 08:35:07 -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=PxP9QKmV; 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]:34698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWKZ1-0006PG-2S for patch@linaro.org; Fri, 01 Oct 2021 11:35:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWKXs-0006Ii-2P for qemu-devel@nongnu.org; Fri, 01 Oct 2021 11:33:56 -0400 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]:36803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWKXq-0007gX-7e for qemu-devel@nongnu.org; Fri, 01 Oct 2021 11:33:55 -0400 Received: by mail-qt1-x82b.google.com with SMTP id l13so9319484qtv.3 for ; Fri, 01 Oct 2021 08:33:53 -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=77S8PHNNwp8gzL3C6UYKL3B8n68oD4JCUCVjCK3xRFU=; b=PxP9QKmVaDWj+uaYhx0NqN3D+jNsTE1j9dODCmn//aCuUMjSyNjpJfxGLe3S9MCvkx 2lm/HfzpWTD6h0EQdeo5xtE/BQVtpTo1NXrVGaSZt2NP4y17lcCz3c7eDFqfjU8rAhtZ 2S7pd0ubDlJD/OcuU0cWAJoqhSc1AIlkaVKHzEvBDPPoJGVNgv7Tmq8waW2eFIjGZK62 2KmOh2rJMv8itqHW3A0nMNzcdTqz7MdSGs9WCdqo45FzFLCEHSU8A0LQrW0cD3Cep+Jn o+jvlRHJM3bYBuSR/sBe8xvnlOwoQRyXepzgJDL7ILJjV75Fpio+N+Ms49a65/pvxqaQ F95w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=77S8PHNNwp8gzL3C6UYKL3B8n68oD4JCUCVjCK3xRFU=; b=B8TURckuq14xEJYwV6ssoN84V09krsAF7hHpijW8hCu74wqgwRmMPQ5MpKEenAL1+v pCddS06oSZwHG+6ApuNwzLVaDtc9ozotsCnac0iKPSl8ZGK+DFE7o9eczmskmwZ3Kelz WzA2+xv8B4KzO9qHWlomSBilI3NJ6WlT/7A7bNpZu+ioAo+EdrU2tR4UGeDocR9Rq8yO pqz+Bwk7rjBfBLls9qKWPNUuO01MKwWyQw02uFj3qm3+RVdaBOLcGPteyQc/qrn542m7 bsNOgfKQN+IQuYgpnjwPwxoUXBlZE8YX1B+zQAT/EwuRYc2bv0a5sINslVhG9xM4dcmS j2nA== X-Gm-Message-State: AOAM533t7t9cl381d5OqYM7aEMxEwcpXkGr0/+dXsIz35sHEJs7X6HWo wCVSWDE84HV929idql1jBeEoKTEQFb/DCw== X-Received: by 2002:ac8:7769:: with SMTP id h9mr13916374qtu.156.1633102433287; Fri, 01 Oct 2021 08:33:53 -0700 (PDT) Received: from localhost.localdomain (c-67-174-166-185.hsd1.ga.comcast.net. [67.174.166.185]) by smtp.gmail.com with ESMTPSA id x8sm3484823qtv.5.2021.10.01.08.33.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 08:33:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/2] tests/docker: Fix fedora-i386-cross Date: Fri, 1 Oct 2021 11:33:40 -0400 Message-Id: <20211001153347.1736014-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211001153347.1736014-1-richard.henderson@linaro.org> References: <20211001153347.1736014-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82b; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x82b.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marex@denx.de, =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , crwulff@gmail.com, laurent@vivier.eu, "Richard W . M . Jones" , Paolo Bonzini , alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" By using PKG_CONFIG_PATH instead of PKG_CONFIG_LIBDIR, we were still including the 64-bit packages. Install pcre-devel.i686 to fill a missing glib2 dependency. By using --extra-cflags instead of --cpu, we incorrectly use the wrong probing during meson. Cc: Alex Bennée Cc: Paolo Bonzini Cc: Daniel P. Berrangé Cc: Richard W.M. Jones Signed-off-by: Richard Henderson --- tests/docker/dockerfiles/fedora-i386-cross.docker | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.25.1 Reviewed-by: Alex Bennée diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index dbb8195eb1..820740d5be 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -17,12 +17,13 @@ ENV PACKAGES \ glibc-static.i686 \ gnutls-devel.i686 \ nettle-devel.i686 \ + pcre-devel.i686 \ perl-Test-Harness \ pixman-devel.i686 \ zlib-devel.i686 -ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user -ENV PKG_CONFIG_PATH /usr/lib/pkgconfig +ENV QEMU_CONFIGURE_OPTS --cpu=i386 --disable-vhost-user +ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt