From 407ac59af39c17882b72cf2a19e0f6e3f28c6eb8 Mon Sep 17 00:00:00 2001 From: John Hay Date: Fri, 9 Aug 2002 07:45:42 +0000 Subject: [PATCH] Add a third floppy to releases. It will only be built if there is a release/${TARGET}/drivers.conf file which list drivers that have to go into the third floppy. Also shuffle i386/drivers.conf so that the floppies don't overflow anymore. Anybody with real/better usage statistics is welcome to shuffle it differently. Reviewed by: ru --- release/Makefile | 28 +++++++++++++++++-------- release/amd64/dokern.sh | 3 +++ release/i386/dokern.sh | 3 +++ release/i386/drivers.conf | 15 +++++++------ release/pc98/dokern.sh | 3 +++ release/scripts/driver-copy2.awk | 36 ++++++++++++++------------------ 6 files changed, 53 insertions(+), 35 deletions(-) diff --git a/release/Makefile b/release/Makefile index 638b97ef1863..59d120926901 100644 --- a/release/Makefile +++ b/release/Makefile @@ -518,7 +518,8 @@ release.5: .endif cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean cd ${.CURDIR}/..; ${TMAKE} build-tools - cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk all + cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk \ + CFLAGS="-Os -pipe" -DNO_CPU_CFLAGS all mv ${j}_crunch/${j}_crunch ${RD}/crunch/${j} .endfor touch release.5 @@ -654,15 +655,15 @@ release.9: > ${RD}/mfsfd/stand/etc/services ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig - gzip -9c ${RD}/trees/base/COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz + cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp .if !defined(NODOC) @for i in ${DIST_DOCS_ARCH_INDEP}; do \ - gzip -9c ${RND}/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \ + cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ done @for i in ${DIST_DOCS_ARCH_DEP}; do \ - gzip -9c ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \ + cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ done - @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT.gz ${RD}/mfsfd/stand/help/INSTALL.TXT.gz + @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT .endif -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd @mkdir -p ${RD}/mfsfd/boot @@ -674,16 +675,23 @@ release.9: @echo "Making the regular boot floppy." @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ tar xf - -C ${RD}/mfsfd/stand - @echo "Compressing doc files..." - @gzip -9 ${RD}/mfsfd/stand/help/*.hlp .if ${TARGET_ARCH} == "alpha" rm -rf ${RD}/mfsfd/stand/help/* .endif .if exists(${.CURDIR}/${TARGET}/drivers.conf) @mkdir -p ${RD}/mfsfd/stand/modules - @awk -f ${.CURDIR}/scripts/driver-copy2.awk \ + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ ${.CURDIR}/${TARGET}/drivers.conf \ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules + -@rm -rf ${RD}/driversfd + @mkdir ${RD}/driversfd + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${RD}/trees/base/boot/kernel ${RD}/driversfd + -@rmdir ${RD}/driversfd + [ -d ${RD}/driversfd ] && sh -e ${.CURDIR}/scripts/doFS.sh \ + ${RD}/floppies/drivers.flp ${RD} ${MNT} ${BOOTSIZE} \ + ${RD}/driversfd ${BOOTINODE} ${BOOTLABEL} .endif sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} @@ -963,7 +971,8 @@ doMFSKERN: cd ${.CURDIR}/..; \ KERNEL_KO=BOOTMFS KODIR= \ ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES -DNO_KERNELCLEAN \ - KERNCONF=BOOTMFS buildkernel reinstallkernel \ + KERNCONF=BOOTMFS COPTFLAGS="-Os -pipe" -DNO_CPU_COPTFLAGS \ + buildkernel reinstallkernel \ DESTDIR=${RD}/kernels [ -r ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS.hints ] && \ cp ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS.hints ${RD}/kernels @@ -995,6 +1004,7 @@ doMFSKERN: .endif @echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "set hint.acpi.0.disable=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc + @echo "set module_path=\"/stand/modules;/dist\"" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT} diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh index 4372ea28db33..9d64e7daf465 100755 --- a/release/amd64/dokern.sh +++ b/release/amd64/dokern.sh @@ -21,6 +21,7 @@ sed -e '/ pty /d' \ -e '/ random /d' \ -e '/ splash$/d' \ -e '/PROCFS/d' \ + -e '/PSEUDOFS/d' \ -e '/KTRACE/d' \ -e '/SYSV/d' \ -e '/SOFTUPDATES/d' \ @@ -83,6 +84,7 @@ sed -e '/ pty /d' \ -e '/ random /d' \ -e '/ splash$/d' \ -e '/PROCFS/d' \ + -e '/PSEUDOFS/d' \ -e '/KTRACE/d' \ -e '/SYSV/d' \ -e '/SOFTUPDATES/d' \ @@ -109,6 +111,7 @@ sed -e '/ pty /d' \ -e '/ ulpt /d' \ -e '/ urio /d' \ -e '/ uscanner /d' \ + -e '/ ses /d' \ -e '/maxusers/d' \ -e 's/ident.*GENERIC/ident BOOTMFS/g' diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh index 4372ea28db33..9d64e7daf465 100755 --- a/release/i386/dokern.sh +++ b/release/i386/dokern.sh @@ -21,6 +21,7 @@ sed -e '/ pty /d' \ -e '/ random /d' \ -e '/ splash$/d' \ -e '/PROCFS/d' \ + -e '/PSEUDOFS/d' \ -e '/KTRACE/d' \ -e '/SYSV/d' \ -e '/SOFTUPDATES/d' \ @@ -83,6 +84,7 @@ sed -e '/ pty /d' \ -e '/ random /d' \ -e '/ splash$/d' \ -e '/PROCFS/d' \ + -e '/PSEUDOFS/d' \ -e '/KTRACE/d' \ -e '/SYSV/d' \ -e '/SOFTUPDATES/d' \ @@ -109,6 +111,7 @@ sed -e '/ pty /d' \ -e '/ ulpt /d' \ -e '/ urio /d' \ -e '/ uscanner /d' \ + -e '/ ses /d' \ -e '/maxusers/d' \ -e 's/ident.*GENERIC/ident BOOTMFS/g' diff --git a/release/i386/drivers.conf b/release/i386/drivers.conf index d1c209b0c9f3..74c129f9bd92 100644 --- a/release/i386/drivers.conf +++ b/release/i386/drivers.conf @@ -39,9 +39,9 @@ an if_an 2 network "Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card" aue if_aue 2 network "ADMtek USB ethernet adapter" cue if_cue 2 network "CATC USB ethernet adapter" dc if_dc 2 network "DEC/Intel 21143 (and clones) PCI fast ethernet card" -de if_de 2 network "DEC DE435 PCI NIC or other DC21040-AA based card" +de if_de 3 network "DEC DE435 PCI NIC or other DC21040-AA based card" ed if_ed 2 network "NE[12]000, SMC Ultra, 3c503, DS8390 ISA ethernet cards" -em if_em 2 network "Intel Pro/1000 PCI gigabit ethernet card" +em if_em 3 network "Intel Pro/1000 PCI gigabit ethernet card" fe if_fe 2 network "Fujitsu MB8696x based cards" fxp if_fxp 2 network "Intel EtherExpress Pro/100B PCI Fast Ethernet card" kue if_kue 2 network "Kawasaki LSI USB ethernet adapter" @@ -51,11 +51,11 @@ pcn if_pcn 2 network "AMD Am79c79x PCI ethernet card" rl if_rl 2 network "RealTek 8129/8139 PCI ethernet card" sf if_sf 2 network "Adaptec AIC-6915 PCI ethernet card" sis if_sis 2 network "SiS 900/SiS 7016 PCI ethernet card" -sk if_sk 2 network "SysKonnect PCI gigabit ethernet card" -sn if_sn 2 network "SMC's 9000 series of ethernet chips" +sk if_sk 3 network "SysKonnect PCI gigabit ethernet card" +sn if_sn 3 network "SMC's 9000 series of ethernet chips" ste if_ste 2 network "Sundance ST201 PCI ethernet card" -ti if_ti 2 network "Alteon Networks PCI gigabit ethernet card" -tl if_tl 2 network "Texas Instruments ThunderLAN PCI ethernet card" +ti if_ti 3 network "Alteon Networks PCI gigabit ethernet card" +tl if_tl 3 network "Texas Instruments ThunderLAN PCI ethernet card" tx if_tx 2 network "SMC 9432TX ethernet card" vr if_vr 2 network "VIA VT3043/VT86C100A Rhine PCI ethernet card" vx if_vx 2 network "3Com 3c590/3c595 PCI ethernet card" @@ -63,6 +63,9 @@ wb if_wb 2 network "Winbond W89C840F PCI ethernet card" wi if_wi 2 network "Lucent WaveLAN/IEEE 802.11 PCMCIA card" xe if_xe 2 network "Xircom pccard ethernet" xl if_xl 2 network "3COM 3c90x / 3c90xB PCI ethernet card" +CD9660 cd9660 2 options "ISO 9660 Filesystem" +MSDOSFS msdosfs 3 options "MSDOS filsystem" +NFSCLIENT nfsclient 3 options "Network Filesystem Client" SYSVSHM sysvshm 2 options "SYSV-style shared memory" SYSVMSG sysvmsg 2 options "SYSV-style message queues" SYSVSEM sysvsem 2 options "SYSV-style semaphores" diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh index 4372ea28db33..9d64e7daf465 100755 --- a/release/pc98/dokern.sh +++ b/release/pc98/dokern.sh @@ -21,6 +21,7 @@ sed -e '/ pty /d' \ -e '/ random /d' \ -e '/ splash$/d' \ -e '/PROCFS/d' \ + -e '/PSEUDOFS/d' \ -e '/KTRACE/d' \ -e '/SYSV/d' \ -e '/SOFTUPDATES/d' \ @@ -83,6 +84,7 @@ sed -e '/ pty /d' \ -e '/ random /d' \ -e '/ splash$/d' \ -e '/PROCFS/d' \ + -e '/PSEUDOFS/d' \ -e '/KTRACE/d' \ -e '/SYSV/d' \ -e '/SOFTUPDATES/d' \ @@ -109,6 +111,7 @@ sed -e '/ pty /d' \ -e '/ ulpt /d' \ -e '/ urio /d' \ -e '/ uscanner /d' \ + -e '/ ses /d' \ -e '/maxusers/d' \ -e 's/ident.*GENERIC/ident BOOTMFS/g' diff --git a/release/scripts/driver-copy2.awk b/release/scripts/driver-copy2.awk index 09358787f1f9..91d34cdbaf3b 100755 --- a/release/scripts/driver-copy2.awk +++ b/release/scripts/driver-copy2.awk @@ -30,7 +30,7 @@ function usage() { - print "usage: driver-copy2.awk config_file src_ko_dir dst_ko_dir" > "/dev/stderr"; + print "usage: driver-copy2.awk flop_num config_file src_ko_dir dst_ko_dir" > "/dev/stderr"; exit 1; } @@ -62,12 +62,13 @@ function readconfig() } BEGIN { - if (ARGC != 4) + if (ARGC != 5) usage(); - config = ARGV[1]; - srcdir = ARGV[2]; - dstdir = ARGV[3]; + fnum = ARGV[1]; + config = ARGV[2]; + srcdir = ARGV[3]; + dstdir = ARGV[4]; readconfig(); @@ -77,20 +78,15 @@ BEGIN { err(1, "cannot find %s directory", dstdir); for (f in flp) { - if (flp[f] == 1) { - print f ": There's nothing to do with driver on first floppy." > "/dev/stderr"; - } else if (flp[f] == 2) { - srcfile = srcdir "/" f ".ko"; - dstfile = dstdir "/" f ".ko"; - dscfile = dstdir "/" f ".dsc"; - print "Copying " f ".ko to " dstdir > "/dev/stderr"; - if (system("cp " srcfile " " dstfile) != 0) - exit 1; - printf "%s", dsc[f] > dscfile; - close(dscfile); - } else if (flp[f] == 3) { - # third driver floppy (not yet implemented) - err(1, "%s: 3rd driver floppy support is not implemented", f); - } + if (flp[f] != fnum) + continue; + srcfile = srcdir "/" f ".ko"; + dstfile = dstdir "/" f ".ko"; + dscfile = dstdir "/" f ".dsc"; + print "Copying " f ".ko to " dstdir > "/dev/stderr"; + if (system("cp " srcfile " " dstfile) != 0) + exit 1; + printf "%s", dsc[f] > dscfile; + close(dscfile); } }