Date: Sat, 25 May 2002 16:14:24 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Takahashi Yoshihiro <nyan@jp.FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src Makefile Makefile.inc1 src/etc Makefile src/gnu/usr.bin/perl/library Makefile.inc src/release Makefile src/release/scripts catpages-make.sh doFS.sh manpages-make.sh src/secure/usr.bin/ssh Makefile src/secure/usr.sbin/sshd Makefile ... Message-ID: <20020525131424.GH35106@sunbay.com> In-Reply-To: <20020525105114.GA35106@sunbay.com> References: <200204261755.g3QHtRv72264@freefall.freebsd.org> <20020524.154011.102579667.nyan@jp.FreeBSD.org> <20020524072243.GA81964@sunbay.com> <20020525.143643.112587985.nyan@jp.FreeBSD.org> <20020525093428.GA28250@sunbay.com> <20020525105114.GA35106@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Sat, May 25, 2002 at 01:51:14PM +0300, Ruslan Ermilov wrote: > On Sat, May 25, 2002 at 12:34:28PM +0300, Ruslan Ermilov wrote: > > On Sat, May 25, 2002 at 02:36:43PM +0900, Takahashi Yoshihiro wrote: > > > In article <20020524072243.GA81964@sunbay.com> > > > Ruslan Ermilov <ru@FreeBSD.org> writes: > > > > > > > > This broke making release for pc98. It makes two kernel floppy images > > > > > for pc98, the one is a normal image, the two is a small (1.2M) image > > > > > for old PC-9801 machines without 1.44M floppy support. > > > > > > > > > Please test this patch: > > > > > > I have changed it for catching up perl->awk change, and try to test. > > > But I have the following error. > > > > > > ftp://snapshots.pc98.jp.freebsd.org/pub/FreeBSD/snapshots/pc98/5.0-CURRENT-20020525-SNAP-PC98.log > > > > > > snapshots.jp has the same error. > > > > > > ftp://snapshots.jp.freebsd.org/pub/FreeBSD/snapshots/i386/5.0-CURRENT-20020525-JPSNAP.log > > > > > Please change "awk" to "gawk" for now. gensub() is the gawk(1)'s extension, > > and one-true-awk doesn't seem to support one, and I'm testing "make releases" > > on 4.x box. I will look into fixing the scripts to be portable (one quick > > solution might be to bootstrap gnu/usr.bin/awk for "make release", and use > > gawk in release/Makefile). > > > > gensub() has a nice feature of handling \[0-9] escapes in the replacement > > string, which I needed. > > > OK, I have now committed the versions that work with one-true-awk as well. > Thanks for the spot! > Now I realized that we don't actually need two calls to createBOOTMFS. Please try this patch instead. I will try it too, and if it works will commit it without waiting for you. :-) %%% Index: Makefile =================================================================== RCS file: /home/ncvs/src/release/Makefile,v retrieving revision 1.681 diff -u -r1.681 Makefile --- Makefile 24 May 2002 11:03:40 -0000 1.681 +++ Makefile 25 May 2002 13:12:17 -0000 @@ -643,18 +643,6 @@ @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot .endif @cp ${RD}/trees/base/boot/loader.help ${RD}/mfsfd/boot - @cd ${.CURDIR}/../sys/${TARGET}/conf && \ - sh ${.CURDIR}/${TARGET_ARCH}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS && \ - [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints -.if exists(${.CURDIR}/${TARGET}/drivers.conf) - @awk -f ${.CURDIR}/scripts/driver-remove.awk \ - ${.CURDIR}/${TARGET}/drivers.conf \ - ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS - @mkdir -p ${RD}/mfsfd/stand/modules - @awk -f ${.CURDIR}/scripts/driver-copy2.awk \ - ${.CURDIR}/${TARGET}/drivers.conf \ - ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules -.endif @echo "Making the regular boot floppy." @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ tar xf - -C ${RD}/mfsfd/stand @@ -663,6 +651,12 @@ .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 \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules +.endif sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} @gzip -9vc mfsroot > mfsroot.gz @@ -927,6 +921,14 @@ doMFSKERN: @echo "Running ${.TARGET} for ${FSIMAGE}" @rm -f ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE} + @cd ${.CURDIR}/../sys/${TARGET}/conf && \ + sh ${.CURDIR}/${TARGET_ARCH}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS && \ + [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints +.if exists(${.CURDIR}/${TARGET}/drivers.conf) + @awk -f ${.CURDIR}/scripts/driver-remove.awk \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS +.endif cd ${.CURDIR}/..; \ KERNEL_KO=BOOTMFS KODIR= \ ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_WERROR -DNO_MODULES -DNO_KERNELCLEAN \ %%% Cheers, -- 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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) iD8DBQE8744wUkv4P6juNwoRAoXeAJ9DY11xYWwpaGQRfT+m/fCEBBnEvACfbPFM 13mONr0Wjz4xMFlNFEnzusI= =+24C -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020525131424.GH35106>