From patchwork Thu Oct 14 22:44:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1541193 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=qPE7KVm6; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVl026Lmzz9sX3 for ; Fri, 15 Oct 2021 09:47:14 +1100 (AEDT) Received: from localhost ([::1]:48896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb9VI-0005w5-Cj for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 18:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb9Ss-0002lY-Ca for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:42 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:42531) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb9Sq-0004Jc-S5 for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:42 -0400 Received: by mail-pf1-x429.google.com with SMTP id m14so6711939pfc.9 for ; Thu, 14 Oct 2021 15:44:40 -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=TLXzZWfNaYKwqtM1Kn97ZLYqBJk/lPUwe18as3UZkwQ=; b=qPE7KVm6luMvi8IJZf0Jl4+4lWrUf4WFHJWDZE74b4ckq5bYsPgQ5Qk8EKRdJlXskx RSpkBJba/hR6RRUI8gfkpmhvhYopsbRmaZqUow9RKT9YrysddssYaNyrJu1eB4sw31Ij NR3Ds1P94F2I3LCE7oaNkDm+MEhG0qv4z2F19t/LJK0I665e1Ga04ruHND/C4BXF34ty FtT5fuIs3sEOVziP7zzSnDksslJGEUYljQki7luKromWzql8q1ql+KGP6NrontFDp95Q h2rTZ3GXEYUbKSRng7U73K5pEaNf/i7JiJSM8FzRq6L7VRPqWO65HkB9z4/d/jAaFwNN 0NaA== 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=TLXzZWfNaYKwqtM1Kn97ZLYqBJk/lPUwe18as3UZkwQ=; b=MRkNCdtSIlJgKrnQKhbR6H3u6GKlZTs1vyqzts4VoM59djFZcVEC0GWL5Bl0PZ8QsG gc20tRr5Fpt9Ez9Go5y+uOLDRv53RPuxlRY3PHPe/HHRa6hdEEzBDTWRwzjsZjiRaWQk zpSWDaJ9vAsVAyrFE4dlpNd/4k7bys1ldleLw1F+9N6Mn3l7Ey++sVxYyGp+hzNX4Kyp i5J5VmOsbsniqIIzBmXcRHP3TX68nj3rIArhJisxU1nUURxuJsay4IuyWohYAq4MRGG7 AW4JKSe1VbwSyyW+XoFvcaPFOm7LpzoCABiRFyhMBxS6IDPOn+YQaxi1LiLe5T4oWWD6 LQaA== X-Gm-Message-State: AOAM532N9YTkN3fnWYcGzVhym8/Ou+zQzJH7LldxCcZVHe5tGHt0dBNY CmCEqx6lw+KD1SNh5oGvKJOR20fyrH0yJA== X-Google-Smtp-Source: ABdhPJwJ1gM2iaqAtdUEkg5ujnq83tFPcH+39VnkENqB4CKR002h5OSVL80rjNw0J0084RrWgU33FQ== X-Received: by 2002:a62:8284:0:b0:44c:6490:4a2d with SMTP id w126-20020a628284000000b0044c64904a2dmr7836194pfd.38.1634251479269; Thu, 14 Oct 2021 15:44:39 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m10sm9506208pjs.21.2021.10.14.15.44.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 15:44:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/7] tests/docker: Use apt build-dep in debian10 Date: Thu, 14 Oct 2021 15:44:29 -0700 Message-Id: <20211014224435.2539547-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014224435.2539547-1-richard.henderson@linaro.org> References: <20211014224435.2539547-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replace the complex apt-get subshell with apt build-dep. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- tests/docker/dockerfiles/debian10.docker | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index b414af1b9f..d3bbb90c64 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -14,7 +14,8 @@ RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.lis # Install common build utilities RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive \ + apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bc \ @@ -33,5 +34,7 @@ RUN apt update && \ psmisc \ python3 \ python3-sphinx \ - python3-sphinx-rtd-theme \ - $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) + python3-sphinx-rtd-theme + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy qemu From patchwork Thu Oct 14 22:44:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1541196 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=xEPxzELZ; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVl2W0skFz9sX3 for ; Fri, 15 Oct 2021 09:49:23 +1100 (AEDT) Received: from localhost ([::1]:56238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb9XM-0002XI-Ra for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 18:49:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb9Ss-0002mj-UQ for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:42 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:44717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb9Sr-0004Jw-Eb for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:42 -0400 Received: by mail-pg1-x536.google.com with SMTP id q12so3924604pgq.11 for ; Thu, 14 Oct 2021 15:44:40 -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=g8hjqcy59VN6P/kOU18jEGQwnkWxMefSfkUBnHfe+Gc=; b=xEPxzELZhnQpKsuXFaNqj+1l4OyRCwqRbmhKYbB667CbKQoQ01w9oHbGC14qmVrJIs 5FTfnKtXVMyOvN+S/DrwW1/elPJHmJjn9owRqVrZlOOuC6/8Ad9j9AKy81HmjGU+E95K q/VMA3HivaaROmiAr2/e+Z6JEOjWA+gTC9rN2QiIFRz6pl7xBMA3vn9sl5QAHQQuw5cp a/U8+XcRCkDfl++cV1DA78pqV6n7hxm57LCsEcsJEyPE0tHtMkaj4xHll86aBtLZgZV8 imDkHuqkyoDzMEg8lHqbPYfVnRUrpHo9Ew1YxfWRHWF/2y31IuAvagcGQtVvRJnCPMsF aY9A== 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=g8hjqcy59VN6P/kOU18jEGQwnkWxMefSfkUBnHfe+Gc=; b=sjR+ApDzc52+N5zUUVLJnw1N10XfbDv14Tutqz1rN8iUmr1YJW+7Bl0Bx+HA9kdqxj N6mXKUxmHoXmBgVs26oyxPLNvJY33DiHCu2todM8JTz51QfLc5UuvtvMzHpl7jZTM7t1 BhLFRrwIBbwPNOQWODAkgXJsLF5NcpNDZnAohO/7449GJfikG1fTqh5G8y0eKWKwdOqn MQmEQ+gpqIxXXxe5jNYDjK6NCRW1GsE+p2KfnSj02HpTyJhJ/odJMuYfVXvycsyUBPcL fxNQyPeuAaHo8FC5ndIwls4rVYlR6SJFzw7U8zt+qTrol1/ces6SzY6q8WtqUeuo2q+e O0NQ== X-Gm-Message-State: AOAM532Wy55HG0i5ka7FPra2Fh8vb3bJAfN8OyUvkYYNIAu8kysS3iZ+ n+w9tYw6w/MmLA2lBS8hc28XigJZVgFgRw== X-Google-Smtp-Source: ABdhPJz4Ulav8pRwItSK6JR3QR6HLRvsIfdP3DPnaG88XnkTHIoPAxXJtquM+Usq3ekCARl0ebNymw== X-Received: by 2002:a63:db41:: with SMTP id x1mr6365840pgi.474.1634251479887; Thu, 14 Oct 2021 15:44:39 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m10sm9506208pjs.21.2021.10.14.15.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 15:44:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/7] tests/docker: Simplify debian-all-test-cross Date: Thu, 14 Oct 2021 15:44:30 -0700 Message-Id: <20211014224435.2539547-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014224435.2539547-1-richard.henderson@linaro.org> References: <20211014224435.2539547-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The base debian10 image contains enough to build qemu; we do not need to repeat that within the new image. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- tests/docker/dockerfiles/debian-all-test-cross.docker | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index dedcea58b4..b185b7c15a 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -8,11 +8,6 @@ # FROM qemu/debian10 -# What we need to build QEMU itself -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy qemu - # Add the foreign architecture we want and install dependencies RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ From patchwork Thu Oct 14 22:44:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1541194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Z3jAlijl; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVl1H0jbTz9sX3 for ; Fri, 15 Oct 2021 09:48:17 +1100 (AEDT) Received: from localhost ([::1]:52312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb9WH-0008Kc-W0 for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 18:48:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb9Su-0002qX-Li for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:44 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:35398) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb9Ss-0004Kj-B6 for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:44 -0400 Received: by mail-pf1-x42a.google.com with SMTP id c29so6748764pfp.2 for ; Thu, 14 Oct 2021 15:44:41 -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=D+KG/M2KkUzEvhFsL14D3+0KpP2ynUjE4kg8Sktouks=; b=Z3jAlijlsmpcZE2w/pKk//+TB7QCmRBbGAfrAPn4ZCqh632zZLxErq/D1SjqhQYFBb x7i4/Y/J/6nrafeiChN87/Bvmr7zJaXbe2l0Zhtmk3+AWOd72a4UHWF8418gvAfvHc0A HLmtBKyEg8mhr55v5DRlE4r0IEl8wGcGDfoeWUcZrg+IvrjkXwH7uQ4OGEnLsc8OEy8t ve8M5gValYEZsCJceBBuQiDgeWCE/zbU+0quYeZexQd0MKLJT+Bkgsg8hdv2BaBizwdX jUeHsgB5fE5cKCjj5e5JZhEbKOL2U3wtuQurMFkoPq7SX3WZspHs6aqAmv80/ktlH9R6 pDkw== 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=D+KG/M2KkUzEvhFsL14D3+0KpP2ynUjE4kg8Sktouks=; b=ccPdurdVJlDvGwlgCX5K8P9mKTij5o9a3ho5amC8qcgXk2W6Ny9lAM1oT8o3r4da7G yK/CyhbbODFMWX3XBSxaGdd66l3BJwt2+eA84n5Hwq+LHl9lmHz86zdrg70JVRqZJJMz fxpVmttON29oSjVpvkcRgswdIsBxxt1IA8K+Fq2ipE7xyalkGK5ln8bOYFdFiPXneflE TLqjlS1ABYsuyZhgTx96YkxpOh1C/rpE7nhVH7WHgYhetWfr2TYqRdcC+omsJ1h70ohl jKH6iznDSOMuy1otg1Gk7md6Z9KuNbwHEXpayQ1c5YyVAr/APeW1+Y41b6HxmCQOf9+p 0+Xg== X-Gm-Message-State: AOAM530lnbCx4d4rmt7HlTWn1byVmSjzVeNOswN5an9YFZ2KD/P+i0hg Q1lc54q8iV+xOCHhfxXrXrXcWQya8zpgQg== X-Google-Smtp-Source: ABdhPJyzPvusIQtSAfnfrSywmvbdcDNmH9cQoRZmHR+s8iQigBvoGKiqKGgyeneUxcWgaRXTIwUUTQ== X-Received: by 2002:aa7:80d1:0:b029:399:ce3a:d617 with SMTP id a17-20020aa780d10000b0290399ce3ad617mr8105382pfn.16.1634251480913; Thu, 14 Oct 2021 15:44:40 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m10sm9506208pjs.21.2021.10.14.15.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 15:44:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/7] tests/docker: Update debian-hexagon-cross to a newer toolchain Date: Thu, 14 Oct 2021 15:44:31 -0700 Message-Id: <20211014224435.2539547-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014224435.2539547-1-richard.henderson@linaro.org> References: <20211014224435.2539547-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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: Brian Cain , alex.bennee@linaro.org, Brian Cain Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Brian Cain The new dockerfile uses a complete toolchain built by CodeLinaro. Remove the special casing that was necessary when the dockerfile built the toolchain from source. Suggested-by: Brian Cain Signed-off-by: Richard Henderson --- tests/docker/Makefile.include | 24 +-- .../dockerfiles/debian-hexagon-cross.docker | 45 +----- .../build-toolchain.sh | 141 ------------------ 3 files changed, 9 insertions(+), 201 deletions(-) delete mode 100755 tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b9d4094c2e..d223100dff 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -148,33 +148,11 @@ docker-image-debian-sparc64-cross: docker-image-debian10 # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= - -# -# The build rule for hexagon-cross is special in so far for most of -# the time we don't want to build it. While dockers caching does avoid -# this most of the time sometimes we want to force the issue. -# -docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker - $(if $(NOCACHE), \ - $(call quiet-command, \ - $(DOCKER_SCRIPT) build -t qemu/debian-hexagon-cross -f $< \ - $(if $V,,--quiet) --no-cache \ - --registry $(DOCKER_REGISTRY) --extra-files \ - $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker.d/build-toolchain.sh, \ - "BUILD", "debian-hexagon-cross"), \ - $(call quiet-command, \ - $(DOCKER_SCRIPT) fetch $(if $V,,--quiet) \ - qemu/debian-hexagon-cross $(DOCKER_REGISTRY), \ - "FETCH", "debian-hexagon-cross") \ - $(call quiet-command, \ - $(DOCKER_SCRIPT) update $(if $V,,--quiet) \ - qemu/debian-hexagon-cross --add-current-user, \ - "PREPARE", "debian-hexagon-cross")) - # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 +docker-image-debian-hexagon-cross: docker-image-debian10 docker-image-debian-powerpc-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index d5dc299dc1..f3d7110814 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -1,45 +1,16 @@ # # Docker Hexagon cross-compiler target # -# This docker target is used for building hexagon tests. As it also -# needs to be able to build QEMU itself in CI we include it's -# build-deps. It is also a "stand-alone" image so as not to be -# triggered by re-builds on other base images given it takes a long -# time to build. -# FROM qemu/debian10 -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ - bison \ - cmake \ - flex \ - lld \ - rsync \ - wget + curl \ + xz-utils -ENV TOOLCHAIN_INSTALL /usr/local -ENV ROOTFS /usr/local +RUN curl -#SL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/v2021.09.10/clang+llvm-Sept-2021-cross-hexagon-unknown-linux-musl.tar.xz \ + | tar -xJC /opt -ENV LLVM_URL https://github.com/llvm/llvm-project/archive/bfcd21876adc3498065e4da92799f613e730d475.tar.gz -ENV MUSL_URL https://github.com/quic/musl/archive/aff74b395fbf59cd7e93b3691905aa1af6c0778c.tar.gz -ENV LINUX_URL https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.tar.xz - -ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh - -RUN cd /root/hexagon-toolchain && ./build-toolchain.sh - -FROM debian:buster-slim -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list -# Install QEMU build deps for use in CI -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy git ninja-build && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy --arch-only qemu -COPY --from=0 /usr/local /usr/local -ENV PATH $PATH:/usr/local/bin/ +ENV PATH $PATH:/opt/clang+llvm-Sept-2021-cross-hexagon-unknown-linux-musl/x86_64-linux-gnu/bin +ENV DEF_TARGET_LIST hexagon-linux-user +ENV QEMU_CONFIGURE_OPTS --disable-docs --disable-tools --cross-cc-hexagon=hexagon-unknown-linux-musl-clang diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh deleted file mode 100755 index 19b1c9f83e..0000000000 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/bash - -set -e - -BASE=$(readlink -f ${PWD}) - -TOOLCHAIN_INSTALL=$(readlink -f "$TOOLCHAIN_INSTALL") -ROOTFS=$(readlink -f "$ROOTFS") - -TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin -HEX_SYSROOT=${TOOLCHAIN_INSTALL}/hexagon-unknown-linux-musl -HEX_TOOLS_TARGET_BASE=${HEX_SYSROOT}/usr - -function cdp() { - DIR="$1" - mkdir -p "$DIR" - cd "$DIR" -} - -function fetch() { - DIR="$1" - URL="$2" - TEMP="$(readlink -f "$PWD/tmp.tar.gz")" - wget --quiet "$URL" -O "$TEMP" - cdp "$DIR" - tar xaf "$TEMP" --strip-components=1 - rm "$TEMP" - cd - -} - -build_llvm_clang() { - fetch "$BASE/llvm-project" "$LLVM_URL" - cdp "$BASE/build-llvm" - - cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${TOOLCHAIN_INSTALL} \ - -DLLVM_ENABLE_LLD=ON \ - -DLLVM_TARGETS_TO_BUILD="Hexagon" \ - -DLLVM_ENABLE_PROJECTS="clang;lld" \ - "$BASE/llvm-project/llvm" - ninja all install - cd ${TOOLCHAIN_BIN} - ln -sf clang hexagon-unknown-linux-musl-clang - ln -sf clang++ hexagon-unknown-linux-musl-clang++ - ln -sf llvm-ar hexagon-unknown-linux-musl-ar - ln -sf llvm-objdump hexagon-unknown-linux-musl-objdump - ln -sf llvm-objcopy hexagon-unknown-linux-musl-objcopy - ln -sf llvm-readelf hexagon-unknown-linux-musl-readelf - ln -sf llvm-ranlib hexagon-unknown-linux-musl-ranlib - - # workaround for now: - cat < hexagon-unknown-linux-musl.cfg --G0 --sysroot=${HEX_SYSROOT} -EOF -} - -build_clang_rt() { - cdp "$BASE/build-clang_rt" - cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_CONFIG_PATH="$BASE/build-llvm/bin/llvm-config" \ - -DCMAKE_ASM_FLAGS="-G0 -mlong-calls -fno-pic --target=hexagon-unknown-linux-musl " \ - -DCMAKE_SYSTEM_NAME=Linux \ - -DCMAKE_C_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ - -DCMAKE_ASM_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ - -DCMAKE_INSTALL_PREFIX=${HEX_TOOLS_TARGET_BASE} \ - -DCMAKE_CROSSCOMPILING=ON \ - -DCMAKE_C_COMPILER_FORCED=ON \ - -DCMAKE_CXX_COMPILER_FORCED=ON \ - -DCOMPILER_RT_BUILD_BUILTINS=ON \ - -DCOMPILER_RT_BUILTINS_ENABLE_PIC=OFF \ - -DCMAKE_SIZEOF_VOID_P=4 \ - -DCOMPILER_RT_OS_DIR= \ - -DCAN_TARGET_hexagon=1 \ - -DCAN_TARGET_x86_64=0 \ - -DCOMPILER_RT_SUPPORTED_ARCH=hexagon \ - -DLLVM_ENABLE_PROJECTS="compiler-rt" \ - "$BASE/llvm-project/compiler-rt" - ninja install-compiler-rt -} - -build_musl_headers() { - fetch "$BASE/musl" "$MUSL_URL" - cd "$BASE/musl" - make clean - CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ - CROSS_COMPILE=hexagon-unknown-linux-musl \ - LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ - CROSS_CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ - ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} - PATH=${TOOLCHAIN_BIN}:$PATH make CROSS_COMPILE= install-headers - - cd ${HEX_SYSROOT}/.. - ln -sf hexagon-unknown-linux-musl hexagon -} - -build_kernel_headers() { - fetch "$BASE/linux" "$LINUX_URL" - mkdir -p "$BASE/build-linux" - cd "$BASE/linux" - make O=../build-linux ARCH=hexagon \ - KBUILD_CFLAGS_KERNEL="-mlong-calls" \ - CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ - LD=${TOOLCHAIN_BIN}/ld.lld \ - KBUILD_VERBOSE=1 comet_defconfig - make mrproper - - cd "$BASE/build-linux" - make \ - ARCH=hexagon \ - CC=${TOOLCHAIN_BIN}/clang \ - INSTALL_HDR_PATH=${HEX_TOOLS_TARGET_BASE} \ - V=1 \ - headers_install -} - -build_musl() { - cd "$BASE/musl" - make clean - CROSS_COMPILE=hexagon-unknown-linux-musl- \ - AR=llvm-ar \ - RANLIB=llvm-ranlib \ - STRIP=llvm-strip \ - CC=clang \ - LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ - CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ - ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} - PATH=${TOOLCHAIN_BIN}/:$PATH make CROSS_COMPILE= install - cd ${HEX_TOOLS_TARGET_BASE}/lib - ln -sf libc.so ld-musl-hexagon.so - ln -sf ld-musl-hexagon.so ld-musl-hexagon.so.1 - cdp ${HEX_TOOLS_TARGET_BASE}/../lib - ln -sf ../usr/lib/ld-musl-hexagon.so.1 -} - -build_llvm_clang -build_kernel_headers -build_musl_headers -build_clang_rt -build_musl From patchwork Thu Oct 14 22:44:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1541191 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=M4zNHK7P; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVkyM0wqzz9sX3 for ; Fri, 15 Oct 2021 09:45:47 +1100 (AEDT) Received: from localhost ([::1]:44526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb9Tr-0002wD-SY for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 18:45:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb9Sw-0002tQ-0p for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:46 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:43940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb9St-0004ME-Lj for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:45 -0400 Received: by mail-pl1-x634.google.com with SMTP id y1so5141175plk.10 for ; Thu, 14 Oct 2021 15:44:43 -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=ckbjJRykTA5MsIBCGHObS6KYVtTnOmvV9h1EyLaQrJ8=; b=M4zNHK7PUgK+6wNAImdnQygx1qXMyQpAGaT8pPZvSE6SFkGJ7UQWYPrpKZKw1q1UFv xMexGC3wZAAee9xebS8HVS+52PknmTT4Lpwdv7ePQ9BIaekcnny1nxWIbgVO38EDoLuL jTsO1iYRE/oZew4qpcgSIR9XUqYJdCGfxz4gAP+67zDl//b0yWaQEO2f1WNJ0yJMw0WG yLWWs7E9pSzGTf8DpCY1Tkta6z1TFn4YM9JWuYDUpVIjJ+Q+fZX5ZiBN6h0BmGIMTsoc PNKSoa8cQP9CT2JcW20zq+zprFyqXwEltbHrhJLuYh56vh9wUuF9RTJ+pL2xxtR1D7ns gcbw== 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=ckbjJRykTA5MsIBCGHObS6KYVtTnOmvV9h1EyLaQrJ8=; b=4fsk+YFUbDp00ZWC0g8bp+PmocVJvEDl2UVMxT3R0TkS9g4hVuo1PS1aMs2ut48CXX sNXvrU0fWtm5mOhdReXpfFwDnckpryvGRuVAN2x49Bn/m3cMi9boHU2txRs0DEYhsbUW QIRFsd92RlzyXxrr9zzLN+8XD1WpcxYUtZ8mGSIlVAvM6LH9C+Ap//UUTffP9hb7b3fK hbM71tU51ojOyaARf9eHBUdsY4CggLULXwhwS0O5RQeqiLYMYH2Wjgh0def1nnXs2z5C f+D5wheASCV6SyMbGzwjVGdeF46zQLUKXBUiyhFPUI94VQightedmKZs6LN2TVrmKe/N +9vg== X-Gm-Message-State: AOAM530sK3Lf//rWxhxi4X/s+p8IggpeC2Ie4owp0np5TcK4vkQ1d/is NGBuq8MGtBtw4fF4JkFAm8lIxPMl6ul8iw== X-Google-Smtp-Source: ABdhPJxzhtNH0EC5TYuidcy+thvDpMIAne4jVA/woJplbn8t+smsIxUMpCowv6QSvgaBUwPKuJk0LQ== X-Received: by 2002:a17:90a:9404:: with SMTP id r4mr9194084pjo.240.1634251482254; Thu, 14 Oct 2021 15:44:42 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m10sm9506208pjs.21.2021.10.14.15.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 15:44:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/7] gitlab-ci: Remove special casing for hexagon testing Date: Thu, 14 Oct 2021 15:44:32 -0700 Message-Id: <20211014224435.2539547-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014224435.2539547-1-richard.henderson@linaro.org> References: <20211014224435.2539547-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Now that the hexagon container is using a pre-built toolchain, we do not need to make the build optional. Signed-off-by: Richard Henderson --- .gitlab-ci.d/buildtest.yml | 4 ---- .gitlab-ci.d/container-cross.yml | 27 +++------------------------ 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 5c378e35f9..27b9b6be6b 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -249,14 +249,10 @@ build-user-static: CONFIGURE_ARGS: --disable-tools --disable-system --static MAKE_CHECK_ARGS: check-tcg -# Because the hexagon cross-compiler takes so long to build we don't rely -# on the CI system to build it and hence this job has an optional dependency -# declared. The image is manually uploaded. build-user-hexagon: extends: .native_build_job_template needs: job: hexagon-cross-container - optional: true variables: IMAGE: debian-hexagon-cross TARGETS: hexagon-linux-user diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index a3b5b90552..ed7a849a69 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -47,33 +47,12 @@ armhf-debian-cross-container: variables: NAME: debian-armhf-cross -# We never want to build hexagon in the CI system and by default we -# always want to refer to the master registry where it lives. hexagon-cross-container: - image: docker:stable - stage: containers - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: never - - when: always + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] variables: NAME: debian-hexagon-cross - GIT_DEPTH: 1 - services: - - docker:dind - before_script: - - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - script: - - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - - docker pull $COMMON_TAG - - docker tag $COMMON_TAG $TAG - - docker push "$TAG" - after_script: - - docker logout hppa-debian-cross-container: extends: .container_job_template From patchwork Thu Oct 14 22:44:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1541197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=oDfbWoOR; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVl4T6G7sz9sX3 for ; Fri, 15 Oct 2021 09:51:05 +1100 (AEDT) Received: from localhost ([::1]:58962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb9Z1-0004Op-LT for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 18:51:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb9Sz-00033m-Px for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:49 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:43947) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb9Sv-0004ND-Ie for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:49 -0400 Received: by mail-pf1-x434.google.com with SMTP id 187so6706054pfc.10 for ; Thu, 14 Oct 2021 15:44:44 -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=aczB35SHWFaFaMgBb9g1Ob+SREIcDIjaeXltlaQr3r0=; b=oDfbWoORcP1fbUG0GxKUoVaVplDA9EINPhDnwJGNkHuZwpJjZxyVfMirL6vP+CZSyS 9mQuYxiapot7+pFEJt1LUv5V3Yb5GsmlLTX7/M2zTSExqOhOET2RZT9XC0Cld8nHTns9 mmEd87we0jyxhW8mYqi2Qh52mVRcXrcH99dScwfc9fCYLVJPj+uSnbiff3g1UL2KIlcG tuSbbj3Q8hAEYnYXd4RzGhVOXjdTQqtVW741//QMQzRZGkNNxGEzz8TH8r0d7NKHGfM/ 4eDE3WOeLw3uvyiCLlXaYU2Yf6nV8f29zreTTAuqbvvHAyAFXrBXfikSqKVBFnx3Ifwd n0+g== 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=aczB35SHWFaFaMgBb9g1Ob+SREIcDIjaeXltlaQr3r0=; b=pPxAFq5wG9cNsZA1hzMC6TgQZtlNjkpcqo9hEc9lFhEhWDA1Hf+sDuNCj9VwGB9n/r YvSpNnDOH3TB9f4NY29zAvbG7/9L3Yv09VcbENs0mMuWRhvW6RnBrBM3hus43lgc5NEa AtZ86kPrzhIYDKY6mGBYv1tSTWNEnC8mcOrMAoUb1NkBMACzqzU4kmV8RfuSMlv8VaHH rSXFtB+vLzIgf1piwdqS59EPwnBf4IJAEXTebsJF/XWb6sEe/U3qTeSWiqGfR9Kp5xPA LNlv3D8ZwVwQlbY1PSmMzC1rbRnTMxJoiRdGfqxl6TxuwEHjleQG+rq6TDzyHfyb8PBF Gmqw== X-Gm-Message-State: AOAM532RmvBOjx/X7FD9tJIdC5LW+vEIn2AIhGX0uAKwVQOW+ApirFxW j/Fyd+daPZ1ZZZFtuU2XZEEuL6TKjzgslA== X-Google-Smtp-Source: ABdhPJxPNBKezNghNBSlUAHw1XvBWIk7MsSrBRfcx/FpG48ySXDZWY9iFUlJvK1gvpZyHoM3ePj1rA== X-Received: by 2002:a62:6243:0:b0:44b:e10e:61b0 with SMTP id w64-20020a626243000000b0044be10e61b0mr7706713pfb.53.1634251483860; Thu, 14 Oct 2021 15:44:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m10sm9506208pjs.21.2021.10.14.15.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 15:44:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 5/7] tests/docker: Add debian-nios2-cross image Date: Thu, 14 Oct 2021 15:44:33 -0700 Message-Id: <20211014224435.2539547-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014224435.2539547-1-richard.henderson@linaro.org> References: <20211014224435.2539547-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Build the entire cross tool chain from source. For this reason, default to caching. Signed-off-by: Richard Henderson --- tests/docker/Makefile.include | 24 +++++ .../debian-nios2-cross.d/build-toolchain.sh | 87 +++++++++++++++++++ .../dockerfiles/debian-toolchain.docker | 36 ++++++++ 3 files changed, 147 insertions(+) create mode 100755 tests/docker/dockerfiles/debian-nios2-cross.d/build-toolchain.sh create mode 100644 tests/docker/dockerfiles/debian-toolchain.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d223100dff..772e0968aa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -148,11 +148,34 @@ docker-image-debian-sparc64-cross: docker-image-debian10 # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= +debian-toolchain-run = \ + $(if $(NOCACHE), \ + $(call quiet-command, \ + $(DOCKER_SCRIPT) build -t qemu/$1 -f $< \ + $(if $V,,--quiet) --no-cache \ + --registry $(DOCKER_REGISTRY) --extra-files \ + $(DOCKER_FILES_DIR)/$1.d/build-toolchain.sh, \ + "BUILD", $1), \ + $(call quiet-command, \ + $(DOCKER_SCRIPT) fetch $(if $V,,--quiet) \ + qemu/$1 $(DOCKER_REGISTRY), \ + "FETCH", $1) \ + $(call quiet-command, \ + $(DOCKER_SCRIPT) update $(if $V,,--quiet) \ + qemu/$1 --add-current-user, \ + "PREPARE", $1)) +debian-toolchain = $(call debian-toolchain-run,$(patsubst docker-image-%,%,$1)) + +docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ + $(DOCKER_FILES_DIR)/debian-nios2-cross.d/build-toolchain.sh + $(call debian-toolchain, $@) + # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 docker-image-debian-hexagon-cross: docker-image-debian10 +docker-image-debian-nios2-cross: docker-image-debian10 docker-image-debian-powerpc-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds @@ -161,6 +184,7 @@ DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross +DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross diff --git a/tests/docker/dockerfiles/debian-nios2-cross.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-nios2-cross.d/build-toolchain.sh new file mode 100755 index 0000000000..ba3c9d8aff --- /dev/null +++ b/tests/docker/dockerfiles/debian-nios2-cross.d/build-toolchain.sh @@ -0,0 +1,87 @@ +#!/bin/bash + +set -e + +TARGET=nios2-linux-gnu +LINUX_ARCH=nios2 + +J=$(expr $(nproc) / 2) +TOOLCHAIN_INSTALL=/usr/local +TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin +CROSS_SYSROOT=${TOOLCHAIN_INSTALL}/$TARGET/sys-root + +export PATH=${TOOLCHAIN_BIN}:$PATH + +# +# Grab all of the source for the toolchain bootstrap. +# + +wget https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz +wget https://ftp.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz +wget https://ftp.gnu.org/gnu/glibc/glibc-2.34.tar.xz +wget https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.70.tar.xz + +tar axf binutils-2.37.tar.xz +tar axf gcc-11.2.0.tar.xz +tar axf glibc-2.34.tar.xz +tar axf linux-5.10.70.tar.xz + +mv binutils-2.37 src-binu +mv gcc-11.2.0 src-gcc +mv glibc-2.34 src-glibc +mv linux-5.10.70 src-linux + +mkdir -p bld-hdr bld-binu bld-gcc bld-glibc +mkdir -p ${CROSS_SYSROOT}/usr/include + +# +# Install kernel and glibc headers +# + +cd src-linux +make headers_install ARCH=${LINUX_ARCH} INSTALL_HDR_PATH=${CROSS_SYSROOT}/usr +cd .. + +cd bld-hdr +../src-glibc/configure --prefix=/usr --host=${TARGET} +make install-headers DESTDIR=${CROSS_SYSROOT} +touch ${CROSS_SYSROOT}/usr/include/gnu/stubs.h +cd .. + +# +# Build binutils +# + +cd bld-binu +../src-binu/configure --disable-werror \ + --prefix=${TOOLCHAIN_INSTALL} --with-sysroot --target=${TARGET} +make -j${J} +make install +cd .. + +# +# Build gcc, without shared libraries, because we do not yet +# have a shared libc against which to link. +# + +cd bld-gcc +../src-gcc/configure --disable-werror --disable-shared \ + --prefix=${TOOLCHAIN_INSTALL} --with-sysroot --target=${TARGET} \ + --enable-languages=c --disable-libssp --disable-libsanitizer \ + --disable-libatomic --disable-libgomp --disable-libquadmath +make -j${J} +make install +cd .. + +# +# Build glibc +# There are a few random things that use c++ but we didn't build that +# cross-compiler. We can get away without them. Disable CXX so that +# glibc doesn't try to use the host c++ compiler. +# + +cd bld-glibc +CXX=false ../src-glibc/configure --prefix=/usr --host=${TARGET} +make -j${j} +make install DESTDIR=${CROSS_SYSROOT} +cd .. diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker new file mode 100644 index 0000000000..738d808aa6 --- /dev/null +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -0,0 +1,36 @@ +# +# Docker toolchain cross-compiler +# +# This dockerfile is used for building a cross-compiler toolchain. +# The script for building the toolchain is supplied via extra-files. +# +FROM qemu/debian10 + +# Install build utilities for building gcc and glibc. +# ??? The build-dep isn't working, missing a number of +# minimal build dependiencies, e.g. libmpc. + +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + flex \ + gawk \ + libmpc-dev \ + libmpfr-dev \ + rsync \ + texinfo \ + wget && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy --arch-only gcc glibc + +ADD build-toolchain.sh /root/build-toolchain.sh + +RUN cd /root && ./build-toolchain.sh + +# Throw away the extra toolchain build deps, the downloaded source, +# and the build trees by restoring the original debian10 image, +# then copying the built toolchain from stage 0. +FROM qemu/debian10 +COPY --from=0 /usr/local /usr/local From patchwork Thu Oct 14 22:44:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1541195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=G+Juvk+n; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVl1P6fwlz9sX3 for ; Fri, 15 Oct 2021 09:48:25 +1100 (AEDT) Received: from localhost ([::1]:53164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb9WR-0000Rx-O7 for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 18:48:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb9Sy-00030s-SA for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:48 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:38415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb9Sw-0004Ot-KS for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:48 -0400 Received: by mail-pg1-x52f.google.com with SMTP id e65so4447432pgc.5 for ; Thu, 14 Oct 2021 15:44:46 -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=r9iF0kLWrrnXeaVvtPHxPaSy5Nma/QdJ8c+3ZFjg58o=; b=G+Juvk+nw8RL9mGzK+rPc/bMHU3PShfY4iMMayzIOIw2KA6mXi+0u8sPpGRM2UYioQ jASDt4ShcZs8lQIkWGa0ofQTJ6dHvKjPiVAIOYTy8RI1cFyo0WirFtNQub9y8vBowYHO j7Q7MsrPoCHEkKrUkh8pwHR2V8rmOK+uwU3XMtGKJ17CL9TK6leKj62GYZlx1/TxrpVZ MAp5UmlNe9GUjYLOq/O2jBMXzQJjbYR0udU27AFYR6TlSUIB2oqjLEvpJDMVmNpOyzCs ebwBDyi8RjKg5/c1/AqbN+Mh5OVNIvn4z6YrIQvbQNbz3zgZX/Fm/gIX/cxnhT40kjF7 S6tw== 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=r9iF0kLWrrnXeaVvtPHxPaSy5Nma/QdJ8c+3ZFjg58o=; b=5BBsRnI3BFWiBuuE6RrBkw7Sr5sWrLfxAa13z6ZlJ3mExGcabqA3XLoputfkGguVCL B5/IdkoT2dOKrvM+h2uM2PNgg71RqbtmIj9b+RJk2HMObMQUTlZcwUd/yMvU5OAuYy4s YvEN6Br9qebi6ybp3GM5zYUpEK8471gYGbfUDOAuT7S/rw6C3t/kN9nL+MEPlrHyxG6q 7gPi1jPpItRmUyYO21faWYXi/y/rUTg1cY1xrQPGIf8xy+1kLSz8DbgLRm4CSV/9sIHX Hf32f6yqDC2o3HTHt3FxgW4AtWhbdzng0J3Yjr3Rc3qe6Qf33jsdm7g3ayVDvdagYC1P g6GA== X-Gm-Message-State: AOAM530us7Lo5nTi3GXoNZ0W+dwTWxrP7tGotqQyW+GcQg92LYTRujL5 D2S1iMbEPUkZ6eMIFiCi5vZA8UbAjkYpSQ== X-Google-Smtp-Source: ABdhPJwIR33ZxOVL0Djla9m3yBVApbvQLOeHKR4s4B+n5a1uVZdIM4kbs0wqbTrKbacCsNBn6qmq3Q== X-Received: by 2002:a05:6a00:8c7:b0:44c:a7f9:d8d1 with SMTP id s7-20020a056a0008c700b0044ca7f9d8d1mr8107355pfu.49.1634251485243; Thu, 14 Oct 2021 15:44:45 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m10sm9506208pjs.21.2021.10.14.15.44.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 15:44:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 6/7] tests/docker: Add debian-microblaze-cross image Date: Thu, 14 Oct 2021 15:44:34 -0700 Message-Id: <20211014224435.2539547-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014224435.2539547-1-richard.henderson@linaro.org> References: <20211014224435.2539547-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Build the entire cross tool chain from source. For this reason, default to caching. Signed-off-by: Richard Henderson --- tests/docker/Makefile.include | 6 ++ .../build-toolchain.sh | 88 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100755 tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 772e0968aa..3594290b7f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -166,6 +166,10 @@ debian-toolchain-run = \ "PREPARE", $1)) debian-toolchain = $(call debian-toolchain-run,$(patsubst docker-image-%,%,$1)) +docker-image-debian-microblaze-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ + $(DOCKER_FILES_DIR)/debian-microblaze-cross.d/build-toolchain.sh + $(call debian-toolchain, $@) + docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(DOCKER_FILES_DIR)/debian-nios2-cross.d/build-toolchain.sh $(call debian-toolchain, $@) @@ -175,6 +179,7 @@ docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 docker-image-debian-hexagon-cross: docker-image-debian10 +docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 docker-image-debian-powerpc-test-cross: docker-image-debian11 @@ -184,6 +189,7 @@ DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross +DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross diff --git a/tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh new file mode 100755 index 0000000000..23ec0aa9a7 --- /dev/null +++ b/tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh @@ -0,0 +1,88 @@ +#!/bin/bash + +set -e + +TARGET=microblaze-linux-musl +LINUX_ARCH=microblaze + +J=$(expr $(nproc) / 2) +TOOLCHAIN_INSTALL=/usr/local +TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin +CROSS_SYSROOT=${TOOLCHAIN_INSTALL}/$TARGET/sys-root + +export PATH=${TOOLCHAIN_BIN}:$PATH + +# +# Grab all of the source for the toolchain bootstrap. +# + +wget https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz +wget https://ftp.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz +wget https://www.musl-libc.org/releases/musl-1.2.2.tar.gz +wget https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.70.tar.xz + +tar axf binutils-2.37.tar.xz +tar axf gcc-11.2.0.tar.xz +tar axf musl-1.2.2.tar.gz +tar axf linux-5.10.70.tar.xz + +mv binutils-2.37 src-binu +mv gcc-11.2.0 src-gcc +mv musl-1.2.2 src-musl +mv linux-5.10.70 src-linux + +mkdir -p bld-hdr bld-binu bld-gcc bld-musl +mkdir -p ${CROSS_SYSROOT}/usr/include + +# +# Install kernel headers +# + +cd src-linux +make headers_install ARCH=${LINUX_ARCH} INSTALL_HDR_PATH=${CROSS_SYSROOT}/usr +cd .. + +# +# Build binutils +# + +cd bld-binu +../src-binu/configure --disable-werror \ + --prefix=${TOOLCHAIN_INSTALL} --with-sysroot --target=${TARGET} +make -j${J} +make install +cd .. + +# +# Build gcc, just the compiler so far. +# + +cd bld-gcc +../src-gcc/configure --disable-werror --disable-shared \ + --prefix=${TOOLCHAIN_INSTALL} --with-sysroot --target=${TARGET} \ + --enable-languages=c --disable-libssp --disable-libsanitizer \ + --disable-libatomic --disable-libgomp --disable-libquadmath +make -j${J} all-gcc +make install-gcc +cd .. + +# +# Build musl. +# We won't go through the extra step of building shared libraries +# because we don't actually use them in QEMU docker testing. +# + +cd bld-musl +../src-musl/configure --prefix=/usr --host=${TARGET} --disable-shared +make -j${j} +make install DESTDIR=${CROSS_SYSROOT} +cd .. + +# +# Go back and build the compiler runtime +# + +cd bld-gcc +make -j${j} +make install +cd .. From patchwork Thu Oct 14 22:44:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1541192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=sQRWCx94; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVkyS38qvz9s0r for ; Fri, 15 Oct 2021 09:45:52 +1100 (AEDT) Received: from localhost ([::1]:44784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb9Ty-00036n-5a for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 18:45:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb9Sy-00030T-Oh for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:48 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:35387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb9Sx-0004PZ-5Z for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:48 -0400 Received: by mail-pg1-x534.google.com with SMTP id e7so6864166pgk.2 for ; Thu, 14 Oct 2021 15:44:46 -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=Fmi/MhIU/mKYGgADyySzLFn+PtliyfqTfVKWwQaBux0=; b=sQRWCx94+gGtAWaoFYpuH8hV+iDYCHHpDgbD9yDn9AWr0cqOsZDiBxOOy1ywTfDAUY SDxwd6bnLamYdEMRovfV0MnbbLiWYNUHvQQpnx7uQbMple4KOuuCTkip6Rk7pDNoEXkD aJwvLEJ7E98lHwZxe9+Y57hgQG+CITEcbG3bxyXyErz2nX052xFmD2hQeVMgULOpuAa4 SEhmBzHVhPeCbaPWQF3n2i9IYOgj4K50AwwLrPPjqVR6x2vBSobJV1JAGtcvVmzevLrb cvYpifK/IobDP3XgSNf6AOY8nP0xSGCbUq7//1nbaAqNRVU+7yu1m+XwCisuQyrfrcA2 FSlg== 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=Fmi/MhIU/mKYGgADyySzLFn+PtliyfqTfVKWwQaBux0=; b=uSJ4TISLpe+n3aHN51eSBE3gs07Xw2o3+Ryem3g/3FrX02T9cE6AZpfLV1beJ8I0NX 0KbxPSetUdhPvnrFsLj0mrz/8MhrpHmxmcjzH71cXKiGb2LtfpayS8WOSdTQA93q01Gc qx0znH3l1nhD/UxFSc6QdvkDSyDOEkjnjph4nxM/gms0P2xAeDnq6imvofPOOh0688+i mso1rhE+CYDVtJIWw59XNXZHoH546KRu1ExqHqU9rKEBn36fXvkRKExuanqkLvZMSZ+z EF5NfLlmTLLGAhHQ0m8b2lc9Ra86IVAV4FdlqkU6z/Pq9Ns9XcxQ9YA0qMhFgScPw8zY V40g== X-Gm-Message-State: AOAM532epLMhsgd+VQrs8hCssbyCheRENj8HglxLZvgSgvWSUynzfpI3 tOll46a7mXHGVO/MQza7Ijk7f99/pPv7Uw== X-Google-Smtp-Source: ABdhPJz6vmF1aOTOxnY7JyrsEyC7dbRjxmFtpWyXwfnJ2PG1anvYm8K9mTZftLj8Ub/FwWPVBKcY5Q== X-Received: by 2002:a62:3893:0:b0:44b:9369:5de5 with SMTP id f141-20020a623893000000b0044b93695de5mr8090129pfa.40.1634251485823; Thu, 14 Oct 2021 15:44:45 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m10sm9506208pjs.21.2021.10.14.15.44.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 15:44:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 7/7] tests/tcg: Enable container_cross_cc for microblaze Date: Thu, 14 Oct 2021 15:44:35 -0700 Message-Id: <20211014224435.2539547-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014224435.2539547-1-richard.henderson@linaro.org> References: <20211014224435.2539547-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.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: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- tests/tcg/configure.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 1f985ccfc0..149eeb15ff 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -55,6 +55,7 @@ fi : ${cross_cc_i386="i686-linux-gnu-gcc"} : ${cross_cc_cflags_i386="-m32"} : ${cross_cc_m68k="m68k-linux-gnu-gcc"} +: $(cross_cc_microblaze="microblaze-linux-musl-gcc") : $(cross_cc_mips64el="mips64el-linux-gnuabi64-gcc") : $(cross_cc_mips64="mips64-linux-gnuabi64-gcc") : $(cross_cc_mipsel="mipsel-linux-gnu-gcc") @@ -133,6 +134,11 @@ for target in $target_list; do container_image=debian-m68k-cross container_cross_cc=m68k-linux-gnu-gcc ;; + microblaze-*) + container_hosts=x86_64 + container_image=debian-microblaze-cross + container_cross_cc=microblaze-linux-musl-gcc + ;; mips64el-*) container_hosts=x86_64 container_image=debian-mips64el-cross