Fixes to unbreak Alpha releases:
Strip ${RD}/mfsfd/stand/etc/defaults/rc.conf. Don't copy loader.help to ${RD}/mfsfd/boot, it serves no useful purpose. Removed the now no-op commands to copy ${RD}/trees/base/dev bits to ${RD}/mfsfd/dev, now that DEVFS is the default. Removed UFS_ACL, PSEUDOFS, and COMPAT_FREEBSD4 options from the BOOTMFS kernel. Moved miibus network module to the drivers floppy. isp(4) and mpt(4) now have corresponding modules, move them to the third floppy as well. Caution! With these changes, mfsroot.flp has only 11K left, and kern.flp has even less -- 5K.
This commit is contained in:
parent
dcf31dd107
commit
d3b193559e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=106457
@ -148,8 +148,6 @@ CRYPTO_DISTS?= crypto krb4 krb5
|
||||
BASE_DISTS?= base
|
||||
DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
|
||||
|
||||
BOOT1= etc/defaults/rc.conf
|
||||
|
||||
# mountpoint for filesystems.
|
||||
MNT= /mnt
|
||||
|
||||
@ -625,13 +623,9 @@ release.9:
|
||||
rm -rf ${RD}/mfsfd
|
||||
mkdir ${RD}/mfsfd
|
||||
cd ${RD}/mfsfd && \
|
||||
mkdir -p etc/defaults dev mnt stand/help
|
||||
mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help
|
||||
@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
|
||||
DIR=${RD}/mfsfd/stand ZIP=false
|
||||
( cd ${RD}/trees/base/dev && \
|
||||
ls console tty bpf0 ttyd0 ttyv0 ttyv1 ttyv2 ttyv3 null zero card0 card1 card2 card3 usb usb0 uhid0 ums0 ulpt0 ugen0 kbd0 kmem mem xpt0 | \
|
||||
cpio -dump ${RD}/mfsfd/dev )
|
||||
( cd ${RD}/mfsfd/dev && rm -f *[swo]d*[bdefgh] )
|
||||
( cd ${RD}/mfsfd && \
|
||||
for dir in bin sbin ; do \
|
||||
ln -sf /stand $$dir; \
|
||||
@ -641,8 +635,7 @@ release.9:
|
||||
cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf
|
||||
.endif
|
||||
cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
|
||||
cd ${RD}/trees/base && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand
|
||||
( for F in netconfig protocols ; do \
|
||||
( for F in defaults/rc.conf netconfig protocols ; do \
|
||||
sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
|
||||
${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
|
||||
done )
|
||||
@ -671,7 +664,6 @@ release.9:
|
||||
.if ${TARGET} == "i386"
|
||||
@cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot
|
||||
.endif
|
||||
@cp ${RD}/trees/base/boot/loader.help ${RD}/mfsfd/boot
|
||||
@echo "Making the regular boot floppy."
|
||||
@tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \
|
||||
tar xf - -C ${RD}/mfsfd/stand
|
||||
|
@ -7,11 +7,13 @@ sed \
|
||||
-e '/DEC_3000_300/d' \
|
||||
-e '/DEC_3000_500/d' \
|
||||
-e '/SOFTUPDATES/d' \
|
||||
-e '/UFS_ACL/d' \
|
||||
-e '/UFS_DIRHASH/d' \
|
||||
-e '/MFS/d' \
|
||||
-e '/NFSSERVER/d' \
|
||||
-e '/NFS_ROOT/d' \
|
||||
-e '/MSDOSFS/d' \
|
||||
-e '/PSEUDOFS/d' \
|
||||
-e '/PROCFS/d' \
|
||||
-e '/KTRACE/d' \
|
||||
-e '/SYSV/d' \
|
||||
@ -24,6 +26,7 @@ sed \
|
||||
-e '/WITNESS/d' \
|
||||
-e '/AHC_REG_PRETTY_PRINT/d' \
|
||||
-e '/AHD_REG_PRETTY_PRINT/d' \
|
||||
-e '/COMPAT_FREEBSD4/d' \
|
||||
-e '/SMP/d' \
|
||||
-e '/atapifd/d' \
|
||||
-e '/atapist/d' \
|
||||
@ -73,6 +76,8 @@ sed \
|
||||
-e '/maxusers/d' \
|
||||
-e 's/ident.*GENERIC/ident BOOTMFS/g'
|
||||
|
||||
echo "options NO_COMPAT_FREEBSD4"
|
||||
|
||||
# reset maxusers to something lower
|
||||
echo "maxusers 5"
|
||||
|
||||
|
@ -39,6 +39,7 @@
|
||||
de if_de 2 network "DEC DE435 PCI NIC or other DC21040-AA based card"
|
||||
txp if_txp 2 network "3Com 3XP Typhoon/Sidewinder (3CR990) NIC"
|
||||
vx if_vx 2 network "3Com 3c590 and 3c595 EtherLink III NIC"
|
||||
miibus miibus 2 network "MII bus support"
|
||||
dc if_dc 2 network "DEC/Intel 21143 and workalikes"
|
||||
pcn if_pcn 2 network "AMD Am79C97x PCI 10/100"
|
||||
fxp if_fxp 2 network "Intel EtherExpress PRO/100B (82557, 82558)"
|
||||
@ -49,5 +50,5 @@ xl if_xl 2 network "3Com 3c90x (``Boomerang'', ``Cyclone'')"
|
||||
amr amr 3 disk "AMI MegaRAID"
|
||||
mlx mlx 3 disk "Mylex DAC-family RAID"
|
||||
ahc ahc 3 disk "AHA2940 and onboard AIC7xxxx devices"
|
||||
#isp isp 3 disk "Qlogic family SCSI"
|
||||
#mpt mpt 3 disk "LSI-Logic MPT-Fusion"
|
||||
isp isp 3 disk "Qlogic family SCSI"
|
||||
mpt mpt 3 disk "LSI-Logic MPT-Fusion"
|
||||
|
Loading…
Reference in New Issue
Block a user