Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 6 Aug 2023 20:36:41 GMT
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 46c05afd2f76 - stable/13 - stand: Update testing script for arch retirement
Message-ID:  <202308062036.376Kafkq042957@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch stable/13 has been updated by marius:

URL: https://cgit.FreeBSD.org/src/commit/?id=46c05afd2f766e7a3700266d17b103087e1a26c5

commit 46c05afd2f766e7a3700266d17b103087e1a26c5
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-08-14 14:41:11 +0000
Commit:     Marius Strobl <marius@FreeBSD.org>
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 <<EOF
-/dev/${dev}a	/		ufs	rw	1	1
-EOF
-    makefs -t ffs -B big -s 200m ${img} ${src}
-    md=$(mdconfig -f ${img})
-    # For non-native builds, ensure that geom_part(4) supports VTOC8.
-    kldload geom_part_vtoc8.ko
-    gpart create -s VTOC8 ${md}
-    gpart add -t freebsd-ufs ${md}
-    ${SRCTOP}/tools/boot/install-boot.sh -g ${geli} -s ${scheme} -f ${fs} -b ${bios} -d ${src} ${md}
-    mdconfig -d -u ${md}
-    rm -f ${src}/etc/fstab
-}
-
 qser="-serial telnet::4444,server -nographic"
 
 # https://wiki.freebsd.org/QemuRecipes
@@ -776,9 +753,6 @@ make_one_image()
 # powerpc64
 # qemu-system-ppc64 -drive file=/path/to/disk.img,format=raw
 
-# sparc64
-# qemu-system-sparc64 -drive file=/path/to/disk.img,format=raw
-
 # Misc variables
 SRCTOP=$(make -v SRCTOP)
 cd ${SRCTOP}/stand
@@ -862,9 +836,8 @@ done
 for arch in arm aarch64; do
     for scheme in gpt mbr; do
 	fs=ufs
-	for bios in uboot efi; do
-	    make_one_image ${arch} ${geli} ${scheme} ${fs} ${bios}
-	done
+	bios=efi
+	make_one_image ${arch} ${geli} ${scheme} ${fs} ${bios}
     done
 done
 
@@ -877,14 +850,10 @@ for arch in powerpc powerpc64; do
     done
 done
 
-for arch in sparc64; do
-    for geli in nogeli; do
-	for scheme in vtoc8; do
-	    for fs in ufs; do
-		for bios in ofw; do
-		    make_one_image ${arch} ${geli} ${scheme} ${fs} ${bios}
-		done
-	    done
-	done
-    done
+for arch in riscv; do
+    geli=nogeli
+    fs=ufs
+    scheme=gpt
+    bios=efi
+    make_one_image ${arch} ${geli} ${scheme} ${fs} ${bios}
 done

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308062036.376Kafkq042957>