From nobody Sun Aug 6 20:36:41 2023 X-Original-To: dev-commits-src-branches@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 4RJrpL30c4z4mNfN; Sun, 6 Aug 2023 20:36:42 +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 4RJrpL0dHDz4cGS; Sun, 6 Aug 2023 20:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354202; 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=PBfWCXW1DRQPgcxzY1DNUxn2bPidZqkIXIUCzxEudmc=; b=ClaYEWuv70beUoHnEAGDxkuM8NLRfDKbC53nn77Bkcfwx1DtTT8QOYPckvYFf++tlN+piq 2y6H9lpUJPKPs0jhv1XrZRj6Pz+15rQoQESi12ov30d14kwESOjPvBbOpFswDKMzKVYT7a TuEys3NGSyhsoZ95ZpqEqukIzO3nQdBSk2WSfwfMMw5+F6wtwyxO3UbCyV67BPoyuZjdmi 4IrLnHaKEzPUr5v70tXXm0Xp0EfrK7E19W7JxRfD90w9GRNJk4yC0AhISu9Ee6h+1xS1wK lms82k+2+5LMJqs4WZioQ0eK5mSlTYW8CJbkXeKveQ9cMJekCuG7sRr4KoK+Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354202; 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=PBfWCXW1DRQPgcxzY1DNUxn2bPidZqkIXIUCzxEudmc=; b=bIp1o5xWQ1/V67QymOtvNLQjEIdLus7PATf1tmQbjepxeNkZSOfjJYWOFDJBCIr9s8BJ1L zRGgAr0MvKSBaewRxim05MlJ8bYS/4a/7eASx8xkOlnnXvxg1dz+srZtDe+j+yB35ubhwf UdE8PbqC2A0EKD6IxEtdTUmUTYoSp8Io+4dqbXboJl9PCmsBSffCpwIc0vHUQm0NnYY1Gp bxbvktR7KwWX2oaOUugv4Qy4rf3FQhIkCF8CNXqDxxpTAyqdkMwmBOnxbANdNHLRqlAWGx Hpq3L+Nv2NKVyg1yWIHJOGDONKqi02Nx6C2lvMuppgDwzlO54CpNIxs2okj9jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354202; a=rsa-sha256; cv=none; b=v1iNLCGQ803E+iUpt5ASoNPfSIpCKaoEGByh03i6iHiHqZW8XogIZgkfdpyH2ctdr3ihig hreZNyD3DfV6TunsHlRQ3RZuYy/6msZx0OC/BsaCPSMLIs9YYYPcj3e5HOc/3NYnE4K7fG 6QKEPdluVOeCHHYwSDurEQd8wodTzEJ03Jw1vfS1eY2veVI2xIKBiTKA3yea/9+cHyNT/x BjTjT3a0XKTo5nBKaH2+5Cs/HBj4xfwpdOXXDLApQes+A+MNZcdjKEl9zVCelG3tyii1ks e7etXqeoTVtHnW+G9NK5wimACqqOUKu9xehc86a+zR+WFycoLYz9fjl+AWePzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RJrpK6s5mz91H; Sun, 6 Aug 2023 20:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376Kaf28042958; Sun, 6 Aug 2023 20:36:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376Kafkq042957; Sun, 6 Aug 2023 20:36:41 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:41 GMT Message-Id: <202308062036.376Kafkq042957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 46c05afd2f76 - stable/13 - stand: Update testing script for arch retirement List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 46c05afd2f766e7a3700266d17b103087e1a26c5 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=46c05afd2f766e7a3700266d17b103087e1a26c5 commit 46c05afd2f766e7a3700266d17b103087e1a26c5 Author: Warner Losh AuthorDate: 2022-08-14 14:41:11 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 19:01:41 +0000 stand: Update testing script for arch retirement And catch up to changes in booting methods currently supported. Add riscv. (cherry picked from commit aff95057bca1dc929996a616b0c39a6ff89a1bbf) --- tools/boot/rootgen.sh | 47 ++++++++--------------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh index b61fff647b5c..fcd5c0afef46 100755 --- a/tools/boot/rootgen.sh +++ b/tools/boot/rootgen.sh @@ -645,29 +645,6 @@ mk_geli_mbr_zfs_both() { # u-boot # powerpc -mk_sparc64_nogeli_vtoc8_ufs_ofw() { - src=$1 - img=$2 - mntpt=$3 - geli=$4 - scheme=$5 - fs=$6 - bios=$7 - - cat > ${src}/etc/fstab <