From nobody Fri Jul 08 17:50:07 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9AF7917D0463; Fri, 8 Jul 2022 17:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lfglz3p6mz49Dx; Fri, 8 Jul 2022 17:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yZD7bu4YLpPV39iakN8sGCuFCVA5V8ytDMiCWDBy1Sk=; b=qR5q/4n1HLvMec10nsp8je+/33z5WVaRrOcinjdA7fSwyc2RGHdEMSj9ClvxYTBwztMjox G733vDDQwdZ6wh3ezbeTr1nLQze/iVqZDnfp1Y6zd9T/GFpAZq2f8jsTvkTsYsNivk+PyU cGqGOExhc2Uj2JWooHsWpqooloj+JzWT+AQxId8FpNtIPxczIHM9LQkkHnuCKg01f65l9+ ssNp64L6alPwLfxZGLrnUIe38GVclG68YiCiJ9rbx3c+4RZUsVj1jdWxgFvTGWSzNVUuq2 sMFKdBPTCtnp0WcMOb+5r5c/apBFkoEhABV38grRo4sKN9vydRctwbtaJ/LNZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lfglz2rQRzG0K; Fri, 8 Jul 2022 17:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 268Ho7H0067256; Fri, 8 Jul 2022 17:50:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Ho7Tv067253; Fri, 8 Jul 2022 17:50:07 GMT (envelope-from git) Date: Fri, 8 Jul 2022 17:50:07 GMT Message-Id: <202207081750.268Ho7Tv067253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9e9ba3cdbe11 - main - test: Update boot universe build architectures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e9ba3cdbe11a411d2ed47c551d8a83f47150c81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yZD7bu4YLpPV39iakN8sGCuFCVA5V8ytDMiCWDBy1Sk=; b=SjEs+Ts5hdY24j10QW6ajfsalBHYFS/h91ZJ/9cx0IXPPmcNVXcokYHcDceNbTI83ofpru QBJomRLqC72c32buLyLySI7LjX8N3z/OBJvPh1yWJYz+whUdIWnQASXAoXj/jVLJsmMRh5 GceStTAX0YKlFJkYYE7w7KKg50pHPqml78GnC0QydtZ4xiRFJ/r+xF8TmkSNWUgyHWucjd STQA6ubRd2t1otcsBDtEqJo8XjcX98QkALgMscqPuz7c/SVcRRPyeHaZovzrJ5GySErYjV 9Dq9AWorVXN/jMjx7kiJEWBY6IgFQtxf13ElzC1T+F5Z9JwmussbExwspVu+4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657302607; a=rsa-sha256; cv=none; b=D4gWaYA4Op9O/QpQEE8k1rUA25GOeizHktbPOhhTbjl1HzI8nsau2ZbecmyCSVDJvCrwR4 9gd4g+cunJlq1gyidYfzBW9Tet4gO79YHBU8SO+rLb79nqHWS1FOmLMv0e3paWVa1VdMOw Vhsi8ngWieyzt5JusWpl35L5Nntp0dJuyBDlGj7PJVxqxS7e2vQlZViRIE6SY24+zOd3nu +Nhrew4XrZNDUjthSRvG/sK7AWQE4UWOUA40ssWvNwIrf0/Y5sye0l0ug9VXcZcFgBTdz7 GvI+Nj360Cn0gr92bx/mA/ls4RydYyui31W/T0dBlnfN4yQJLTEIlJ6L+xcq2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9e9ba3cdbe11a411d2ed47c551d8a83f47150c81 commit 9e9ba3cdbe11a411d2ed47c551d8a83f47150c81 Author: Warner Losh AuthorDate: 2022-07-08 17:07:39 +0000 Commit: Warner Losh CommitDate: 2022-07-08 17:47:37 +0000 test: Update boot universe build architectures We build lua by default, so we don't need another build to build it enabled w/o FORTH. That gives little value over the without forth builds. Remove all mips, they are no longer relevant. Build aarch64 everywhere we build amd64 (except firewire which is x86 only). Build a few more architectures once so we have at least one of every arch we support in at least the default build. This should increase coverage and still take less time than before. Sponsored by: Netflix --- tools/boot/universe.sh | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh index a23678100705..13d707750b86 100755 --- a/tools/boot/universe.sh +++ b/tools/boot/universe.sh @@ -3,13 +3,9 @@ # $FreeBSD$ # -# Full list of all arches, but we only build a subset. All different mips add any -# value, and there's a few others we just don't support. +# Full list of all arches we don't build. # -# mips/mipsel mips/mips mips/mips64el mips/mips64 mips/mipsn32 \ -# mips/mipselhf mips/mipshf mips/mips64elhf mips/mips64hf \ -# powerpc/powerpc powerpc/powerpc64 powerpc/powerpcspe \ -# riscv/riscv64 riscv/riscv64sf +# powerpc/powerpcspe riscv/riscv64sf arm/armv6 # # This script is expected to be run in stand (though you could run it anywhere # in the tree). It does a full clean build. For stand you can do all the archs in @@ -45,7 +41,7 @@ dobuild() echo "Fail (cleanup)" continue fi - if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make ${opt} -j 20 all" \ + if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make ${opt} -j 40 all" \ >> $lf 2>&1; then echo "Fail (build)" continue @@ -58,6 +54,7 @@ cd $top/stand # Build without forth for i in \ + arm64/aarch64 \ amd64/amd64 \ i386/i386 \ ; do @@ -67,6 +64,7 @@ done # Build without GELI for i in \ + arm64/aarch64 \ amd64/amd64 \ i386/i386 \ ; do @@ -74,34 +72,24 @@ for i in \ dobuild $ta _.boot.${ta}.no_geli.log "WITHOUT_LOADER_GEIL=yes" done -# Default build for a goodly selection of architectures +# Default build for a almost all architectures for i in \ amd64/amd64 \ arm/armv7 \ arm64/aarch64 \ i386/i386 \ - mips/mips mips/mips64 \ - powerpc/powerpc powerpc/powerpc64 \ + powerpc/powerpc \ + powerpc/powerpc64 \ + powerpc/powerpc64le \ + riscv/riscv64 \ ; do ta=${i##*/} dobuild $ta _.boot.${ta}.log "" done -# Default build for a goodly selection of architectures with Lua -for i in \ - amd64/amd64 \ - arm/armv7 \ - arm64/aarch64 \ - i386/i386 \ - mips/mips mips/mips64 \ - powerpc/powerpc powerpc/powerpc64 \ - ; do - ta=${i##*/} - dobuild $ta _.boot.${ta}.lua.log "MK_LOADER_LUA=yes MK_FORTH=no" -done - # Build w/o ZFS for i in \ + arm64/aarch64 \ amd64/amd64 \ i386/i386 \ ; do