Date: Wed, 21 Aug 2002 07:44:08 +0200 (SAT) From: John Hay <jhay@icomtek.csir.co.za> To: jhb@FreeBSD.org (John Baldwin) Cc: ru@FreeBSD.org, current@FreeBSD.org Subject: Re: 3 floppy system for -current releases Message-ID: <200208210544.g7L5i9H46483@zibbi.icomtek.csir.co.za> In-Reply-To: <XFMail.20020820161004.jhb@FreeBSD.org> from John Baldwin at "Aug 20, 2002 04:10:04 pm"
next in thread | previous in thread | raw e-mail | index | archive | help
This has been committed already, but I'll answer your questions. If
you are unhappy with anything, go ahead and change it. At the end I
thought it more usefull to have snapshots that complete the building
process, than ones that don't. People can test and give feedback on
something that exists.
> On 08-Aug-2002 John Hay wrote:
> > Here is a try at a 3 floppy system. Most people should be able to
> > install with the first 2 floppies (kern.flp and mfsroot.flp). Just
> > those that need a driver on the third floppy (drivers.flp) will
> > need it.
> >
> > If this idea is acceptable, we should probably tweak what should
> > go on the second floppy and what is used the least and put that
> > on the last one.
> >
> > To load drivers from the drivers floppy, go to "Configure" and then
> > the last option there is "Load KLD".
> >
> > The last 2 files in the diff (bld-ko.sh and driver-list.awk) are not
> > really needed. That is part of my attempt to create a single .ko to
> > save space on mfsroot.flp. But I can't get internal dependancies to
> > work yet. Most drivers depend on miibus and that don't get loaded
> > first.
> >
> > John
> > --
> > John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org
> >
> >
> > Index: usr.sbin/sysinstall/system.c
> > ===================================================================
> > RCS file: /home/ncvs/src/usr.sbin/sysinstall/system.c,v
> > retrieving revision 1.119
> > diff -u -r1.119 system.c
> > --- usr.sbin/sysinstall/system.c 1 Nov 2001 23:32:46 -0000 1.119
> > +++ usr.sbin/sysinstall/system.c 8 Aug 2002 09:17:01 -0000
> > @@ -348,7 +348,13 @@
> > snprintf(buf, FILENAME_MAX, "/stand/help/%s.hlp.gz", file);
> > if (file_readable(buf))
> > return expand(buf);
> > + snprintf(buf, FILENAME_MAX, "/stand/help/%s.hlp", file);
> > + if (file_readable(buf))
> > + return expand(buf);
> > snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT.gz", file);
> > + if (file_readable(buf))
> > + return expand(buf);
> > + snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT", file);
> > if (file_readable(buf))
> > return expand(buf);
> > snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/sysinstall/help/%s.hlp", file);
>
> What does this patch do? It calls expand() so it is expecting an
> uncompressed file which is probably wrong.
The diff show too little content. If you look at that place in the
file, you will see there are others that are the same. That expand()
function only expands when the file has been compressed. It behaves
like "zcat -f".
>
> > Index: release/Makefile
> > ===================================================================
> > RCS file: /home/ncvs/src/release/Makefile,v
> > retrieving revision 1.698
> > diff -u -r1.698 Makefile
> > --- release/Makefile 5 Aug 2002 16:57:43 -0000 1.698
> > +++ release/Makefile 8 Aug 2002 15:40:27 -0000
> > @@ -518,7 +518,8 @@
> > .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 @@
> > > ${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
> > + cat ${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; \
> > + cat ${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; \
> > + cat ${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,28 @@
> > @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
>
> Why in the world are you not compressing the various text files? I thought the name
> of the game was to _decrease_ the size of things on the floppies.
Because you get better returns if you compress them once at the end (when
the whole floppy is compressed) than each individually and then again
at the end. But test for yourself.
>
> The rest of this looks fine although I think perhaps it should be split up into
> a few separate commits (SINGLE_MODULE should be its own commit, driver.flp should
> be its own commit, etc.)
I left the SINGLE_MODULE totally. I couldn't get it to work properly. I
couldn't figure out how to handle interdependancies of modules inside
the single module.
John
--
John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200208210544.g7L5i9H46483>