From nobody Mon Jul 31 18:28:24 2023 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 4RF6FK5RJ6z4pNq0; Mon, 31 Jul 2023 18:28:25 +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 4RF6F46Zswz3sCR; Mon, 31 Jul 2023 18:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690828105; 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=CElO4+0m0BkpF4H36V6n2zxZbqmz7oooMe79yMltz9k=; b=D7NC4k9eoTMwAlN/lbNUoGr3BFppaZqNHw6Em+CC+F3a9wZBTAezfOw4co0Ab9vanjtelS vVuDVfj5BtoBIrn7sBpmNGrhxhMPuOw2jENic6ls6bgTl1zHVULtytqkUth22RDy9yvRJx LAdM7KWdBoGO9IF2jSs7cpUH8A6YUho9f7Z7LEPmbWV2xxArv7sLE9PDy4cAzGy43LBzrx 5xYNzMmevEmnksoXban6AavLwpgyZ9yaWaaWacSllpcbvMS9B1ZOom/akY9bLa0I/00+Qp x8Zq0q0S9eWnhCXntzQ0XYOkKgPpoT78ua/LS4UaedHmAUuSNyHsS2s+UW6G0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690828105; 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=CElO4+0m0BkpF4H36V6n2zxZbqmz7oooMe79yMltz9k=; b=Owg+38QRk9Hu6C0K3on2lBCWN+0rvf3UTWSLQLUFFAmy2VBI9yw2nJsC3Tbl14/8Bh6J97 WKaInlEVaAISGMIqkv13UbXtoLShfV7/ccSj86GyBs7BRM2xianeXuxNaaskp7FyIHVpLc Fp3vbqsSOAUD+KWq2ySLk0X4fCCOJClhrwSUkp79v30kPlUhYpwwhOCvZRd7lJpIuQd2vw J9w3MrVj6i+CbDf4Fh5BVwRts8PHFhhPXlQcaaJk+I6sFTqihfB3+oXtMs1dxEh6glimgw Do7o9IcZMz/toXhqSLlhlLSy/7W6KUnIAOiM0PgmZB6gbbMZI4pVHjw9l+oAeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690828105; a=rsa-sha256; cv=none; b=dA+De9txuNjj4GZD6zVGFmXpzoHa/HdUC2HH/sx3ivln6VlV0XiqB3bgrlXLTE/DhYbkyC yekDepk5MK2D1QtMFZ/YN8E7r901uJ1+xb2OuygIlxD64eKyrNSup7d/ZukKoVKQlbIHJK NM9BzFf6PXyG153JFBV0EGNQEHk8bWyxQrKhbztQafPtMtuV9LeNQcnPOO7msR89j0WXrc 0EbK0nkRJ4CN8qjFcYJjVhDWxfhh0URmAX1233B2HSkCiKnB3xRN849yrMHWGSb9wZDFhC 2wEIym089FT1uaI16/pneXpn38Tsin2v4oXxmzQPRzIQhZPcZ5QUJqDBUcvbpw== 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 4RF6F44H2Cz15g5; Mon, 31 Jul 2023 18:28:24 +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 36VISOcS057948; Mon, 31 Jul 2023 18:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VISOZX057947; Mon, 31 Jul 2023 18:28:24 GMT (envelope-from git) Date: Mon, 31 Jul 2023 18:28:24 GMT Message-Id: <202307311828.36VISOZX057947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Reifenberger Subject: git: dd262a8273d7 - main - Delete i386 support since I dont have a i386 system to rescue and test. 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: mr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd262a8273d78c3dd552706087826ff4db6a34d1 Auto-Submitted: auto-generated The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/src/commit/?id=dd262a8273d78c3dd552706087826ff4db6a34d1 commit dd262a8273d78c3dd552706087826ff4db6a34d1 Author: Michael Reifenberger AuthorDate: 2023-07-31 18:26:14 +0000 Commit: Michael Reifenberger CommitDate: 2023-07-31 18:26:14 +0000 Delete i386 support since I dont have a i386 system to rescue and test. --- tools/tools/nanobsd/rescue/R32 | 14 -------------- tools/tools/nanobsd/rescue/build.sh | 8 -------- tools/tools/nanobsd/rescue/merge.sh | 28 ---------------------------- tools/tools/nanobsd/rescue/rescue_i386.conf | 10 ---------- 4 files changed, 60 deletions(-) diff --git a/tools/tools/nanobsd/rescue/R32 b/tools/tools/nanobsd/rescue/R32 deleted file mode 100644 index 3c15ebee49e7..000000000000 --- a/tools/tools/nanobsd/rescue/R32 +++ /dev/null @@ -1,14 +0,0 @@ -# -# R32 -- Generic kernel configuration file with modifications for rescue. -# -# $FreeBSD$ - -include GENERIC - -ident R32 - -nooptions INVARIANTS -nooptions INVARIANT_SUPPORT -nooptions WITNESS -nooptions WITNESS_SKIPSPIN -nooptions MALLOC_DEBUG_MAXZONES diff --git a/tools/tools/nanobsd/rescue/build.sh b/tools/tools/nanobsd/rescue/build.sh index 7d2ed80cd265..0c7026c868f9 100755 --- a/tools/tools/nanobsd/rescue/build.sh +++ b/tools/tools/nanobsd/rescue/build.sh @@ -26,14 +26,6 @@ sh ../nanobsd.sh $* -c ${CFG} if [ \! -d /usr/obj/Rescue ]; then mkdir -p /usr/obj/Rescue fi -F32="/usr/obj/Rescue/rescue_${today}_x32" -D32="/usr/obj/nanobsd.rescue_i386" -if [ -f "${D32}/_.disk.full" ]; then - cp "${D32}/_.disk.full" "${F32}.img" -fi -if [ -f "${D32}/_.disk.iso" ]; then - cp "${D32}/_.disk.iso" "${F32}.iso" -fi F64="/usr/obj/Rescue/rescue_${today}_x64" D64="/usr/obj/nanobsd.rescue_amd64" diff --git a/tools/tools/nanobsd/rescue/merge.sh b/tools/tools/nanobsd/rescue/merge.sh deleted file mode 100755 index afb66371fe3c..000000000000 --- a/tools/tools/nanobsd/rescue/merge.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -today=`date '+%Y%m%d'` - -I32="/usr/obj/Rescue/rescue_${today}_x32.img" -I64="/usr/obj/Rescue/rescue_${today}_x64.img" -IAL="/usr/obj/Rescue/rescue_${today}_xal.img" -D64="/usr/obj/nanobsd.rescue_amd64" -MNT="/usr/obj/Rescue/_mnt" - -if [ \! -d "$MNT" ]; then - mkdir "$MNT" -fi - -dd if=${I32} of=${IAL} bs=128k -MD=`mdconfig -a -t vnode -f ${IAL}` - -dd if=${D64}/_.disk.image of=/dev/${MD}s2 bs=128k -tunefs -L rescues2a /dev/${MD}s2a -mount /dev/${MD}s2a ${MNT} - -sed -i "" -e 's/rescues1/rescues2/' ${MNT}/conf/base/etc/fstab -sed -i "" -e 's/rescues1/rescues2/' ${MNT}/etc/fstab - -umount ${MNT} - -mdconfig -d -u ${MD} diff --git a/tools/tools/nanobsd/rescue/rescue_i386.conf b/tools/tools/nanobsd/rescue/rescue_i386.conf deleted file mode 100644 index 97b51d49e21d..000000000000 --- a/tools/tools/nanobsd/rescue/rescue_i386.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# $FreeBSD$ -# -NANO_KERNEL=R32 -NANO_ARCH=i386 -TARGET_ARCH=i386; export TARGET_ARCH -#TARGET_CPUTYPE=i386; export TARGET_CPUTYPE -NANO_NAME=rescue_i386 - -. common