Date: Wed, 21 May 2003 20:21:20 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Scott Long <scott_long@btc.adaptec.com> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/release/alpha dokern.sh drivers.conf Message-ID: <20030521172120.GA81292@sunbay.com> In-Reply-To: <3ECBAB08.9060800@btc.adaptec.com> References: <20030521162718.GB73115@sunbay.com> <3ECBAB08.9060800@btc.adaptec.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Wed, May 21, 2003 at 10:36:24AM -0600, Scott Long wrote:
> Ruslan Ermilov wrote:
> >On Wed, May 21, 2003 at 08:28:05AM -0300, Daniel C. Sobral wrote:
> >
> >>And I can't say I'm happy to discover I'm=20
> >>wrong, since my plans call for an increase of 40Kb on i386 for the=20
> >>loader on i386 (rather more on 64 bits archs). I counted on not being=
=20
> >>encumbered by floppy's loader.
> >>
> >
> >FWIW, recompiling loader without FICL, saved me 100K on the kern.flp
> >for Alpha! The patch that does this isn't ready for committing yet,
> >but I will make sure to polish it to the required shape.
> >
>=20
> I have plans for FICL and boot media. I'd rather not reduce the
> functionality of the loader, and instead do easy things like compress
> the .ko files like has been suggested before.
>=20
Whatever. Here's a working patch that recompiles boot loaders
without FICL for the purposes of boot floppies.
I'm real sorry, but that well-known change that split release.9
into release.9 and release.9.alpha now gets in the way, so its
reversion is also included in the patch.
%%%
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.778
diff -u -r1.778 Makefile
--- Makefile 20 May 2003 01:46:09 -0000 1.778
+++ Makefile 21 May 2003 17:08:15 -0000
@@ -493,7 +493,7 @@
mkdir ${RD}/floppies
mkdir ${RD}/trees
mkdir ${RD}/kernels
- for i in ${DISTRIBUTIONS} ; do \
+ for i in ${DISTRIBUTIONS} special; do \
mkdir ${RD}/trees/$$i && \
mtree -deU -f ${MTREEFILES}/BSD.root.dist \
-p ${RD}/trees/$$i > /dev/null && \
@@ -651,117 +651,13 @@
=20
release.9:
.if ${TARGET_ARCH} !=3D "ia64" || ${TARGET_ARCH} =3D=3D ${MACHINE_ARCH}
- cp ${RD}/trees/base/etc/disktab /etc
- rm -rf ${RD}/mfsfd
- mkdir ${RD}/mfsfd
- cd ${RD}/mfsfd && \
- mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help
- @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=3Dboot \
- DIR=3D${RD}/mfsfd/stand ZIP=3Dfalse
- ( cd ${RD}/mfsfd && \
- for dir in bin sbin ; do \
- ln -sf /stand $$dir; \
- done )
- cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand
-.if ${TARGET} =3D=3D "pc98"
- cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard=
=2Econf
+.if exists(${.CURDIR}/../sys/boot/${TARGET}/loader)
+ cd ${.CURDIR}/../sys/boot/${TARGET}/loader; \
+ ${WMAKE} cleandir; \
+ ${WMAKE} obj; \
+ ${WMAKE} -DNOMAN -DNOFORTH all; \
+ ${WMAKE} -DNOMAN -DNOFORTH install DESTDIR=3D${RD}/trees/special
.endif
- cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
- ( 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 )
- grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \
- ${RD}/trees/base/etc/services | \
- sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
- > ${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
- cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp
-.if !defined(NODOC)
- @for i in ${DIST_DOCS_ARCH_INDEP}; do \
- 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 \
- 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 ${RD}/mfsfd/stand/help/INSTAL=
L.TXT
- @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT ${RD}/mfsfd/stand/help/EARLY=
=2ETXT
-.endif
- -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
- @mkdir -p ${RD}/mfsfd/boot
-.if ${TARGET_ARCH} !=3D "ia64"
- @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot
-.endif
-.if ${TARGET} =3D=3D "i386"
- @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot
-.endif
- @echo "Making the regular boot floppy."
- @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \
- tar xf - -C ${RD}/mfsfd/stand
-.if ${TARGET_ARCH} =3D=3D "alpha" && !defined(NO_FLOPPIES)
- rm -rf ${RD}/mfsfd/stand/help/*
-.endif
-.if defined(SMALLBOOTSIZE)
-.if exists(${.CURDIR}/${TARGET}/drivers-small.conf)
- @rm -rf ${RD}/mfsfd/modules
- @mkdir -p ${RD}/mfsfd/modules
- @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \
- ${.CURDIR}/${TARGET}/drivers-small.conf \
- ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
-.endif
- sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
- ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
- @gzip -9vc mfsroot > mfsroot.gz
- @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \
- ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \
- ${BOOTINODE} ${SMALLBOOTLABEL}
-.endif
-.if exists(${.CURDIR}/${TARGET}/drivers.conf)
- @rm -rf ${RD}/mfsfd/modules
- @mkdir -p ${RD}/mfsfd/modules
- @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \
- ${.CURDIR}/${TARGET}/drivers.conf \
- ${RD}/trees/base/boot/kernel ${RD}/mfsfd/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
- if [ -d ${RD}/driversfd ]; then \
- sh -e ${DOFS_SH} \
- ${RD}/floppies/drivers.flp ${RD} ${MNT} ${DRIVERSIZE} \
- ${RD}/driversfd ${DRIVERINODE} ${DRIVERLABEL}; \
- cd ${RD}/driversfd && awk -f ${.CURDIR}/scripts/driver-desc.awk \
- *.dsc >> ${RD}/floppies/DRIVERS.TXT; \
- fi
-.endif
- sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
- ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
- @gzip -9vc mfsroot > mfsroot.gz
- @mkdir -p ${RD}/mfsroot
- @cp mfsroot.gz ${RD}/mfsroot
-.if !defined(NO_FLOPPIES)
-.if defined(BOOTSIZE)
- @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \
- ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
- @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=3Dkern
-.endif
-.if defined(SMALLBOOTSIZE)
- @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=3Dkern-small FDSIZE=3DSMALL
-.endif
-.if defined(BIGBOOTSIZE)
- @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=3Dboot FDSIZE=3DBIG
-.endif
-.endif
- @rm mfsroot mfsroot.gz
- @echo "Regular and MFS boot floppies made."
-.endif
- touch release.9
-
-release.9.alpha:
-.if ${TARGET_ARCH} !=3D "ia64" || ${TARGET_ARCH} =3D=3D ${MACHINE_ARCH}
cp ${RD}/trees/base/etc/disktab /etc
rm -rf ${RD}/mfsfd
mkdir ${RD}/mfsfd
@@ -869,7 +765,7 @@
@rm mfsroot mfsroot.gz
@echo "Regular and MFS boot floppies made."
.endif
- touch release.9.alpha
+ touch release.9
=20
#
# --=3D=3D## Create a fixit floppy ##=3D=3D--
@@ -1087,14 +983,8 @@
md5 * > CHECKSUM.MD5) \
)
=20
-.if ${TARGET_ARCH} =3D=3D "alpha"
-RELEASE9=3Drelease.9.${TARGET_ARCH}
-.else
-RELEASE9=3Drelease.9=20
-.endif
-
doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \
- release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET}
+ release.6 release.7 release.8 release.9 ${FIXIT_TARGET}
@cd ${.CURDIR} && ${MAKE} ${EXTRAS}
@echo "Release done"
=20
@@ -1176,11 +1066,11 @@
@mkdir -p ${RD}/image.${FSIMAGE}/boot
.if ${TARGET} =3D=3D "i386"
@${WMAKEENV} kgzip -v -l ${RD}/trees/base/usr/lib/kgzldr.o \
- -o ${RD}/image.${FSIMAGE}/boot/loader ${RD}/trees/base/boot/loader
+ -o ${RD}/image.${FSIMAGE}/boot/loader ${RD}/trees/special/boot/loader
.elif ${TARGET_ARCH} =3D=3D "ia64"
@cp ${RD}/trees/base/boot/loader.efi ${RD}/image.${FSIMAGE}/boot
.else
- @cp ${RD}/trees/base/boot/loader ${RD}/image.${FSIMAGE}/boot
+ @cp ${RD}/trees/special/boot/loader ${RD}/image.${FSIMAGE}/boot
.endif
@[ -r ${RD}/kernels/BOOTMFS.${FSIMAGE}.hints ] && \
sed -e '/^hint/s/^/set /' -e '/^#/d' \
%%%
Cheers,
--=20
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
--5mCyUwZo2JvN/JJP
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE+y7WQUkv4P6juNwoRAvWsAJ4+Q1HeIRjDb9MyPAxZW5JHa10STACcD1/f
jCIwlaBnKxi5EGTbfHYpP4g=
=D3n5
-----END PGP SIGNATURE-----
--5mCyUwZo2JvN/JJP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030521172120.GA81292>