Date: Fri, 24 May 2002 10:22:43 +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: <20020524072243.GA81964@sunbay.com> In-Reply-To: <20020524.154011.102579667.nyan@jp.FreeBSD.org> References: <200204261755.g3QHtRv72264@freefall.freebsd.org> <20020524.154011.102579667.nyan@jp.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--BOKacYhQ+x31HxR3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, May 24, 2002 at 03:40:11PM +0900, Takahashi Yoshihiro wrote:
> In article <200204261755.g3QHtRv72264@freefall.freebsd.org>
> Ruslan Ermilov <ru@FreeBSD.org> writes:
>=20
> > ru 2002/04/26 10:55:27 PDT
> >=20
> > Milestone #1 in cross-arch make releases.
> > =20
> > Inline createBOOTMFS target.
>=20
> 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.
>=20
Please test this 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.680
diff -u -p -u -r1.680 Makefile
--- Makefile 18 May 2002 00:00:41 -0000 1.680
+++ Makefile 24 May 2002 07:22:08 -0000
@@ -643,18 +643,7 @@ release.9:
@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)
- @perl ${.CURDIR}/scripts/driver-remove.pl \
- ${.CURDIR}/${TARGET}/drivers.conf \
- ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
- @mkdir -p ${RD}/mfsfd/stand/modules
- @perl ${.CURDIR}/scripts/driver-copy2.pl \
- ${.CURDIR}/${TARGET}/drivers.conf \
- ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules
-.endif
+ @cd ${.CURDIR} && ${MAKE} createBOOTMFS
@echo "Making the regular boot floppy."
@tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \
tar xf - -C ${RD}/mfsfd/stand
@@ -663,6 +652,12 @@ release.9:
.if ${TARGET_ARCH} =3D=3D "alpha"
rm -rf ${RD}/mfsfd/stand/help/*
.endif
+.if exists(${.CURDIR}/${TARGET}/drivers.conf)
+ @mkdir -p ${RD}/mfsfd/stand/modules
+ @perl ${.CURDIR}/scripts/driver-copy2.pl \
+ ${.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
@@ -922,11 +917,25 @@ installCRUNCH:
fi
=20
#
+# --=3D=3D## BOOTMFS config file ##=3D=3D--
+#
+createBOOTMFS:
+ @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)
+ @perl ${.CURDIR}/scripts/driver-remove.pl \
+ ${.CURDIR}/${TARGET}/drivers.conf \
+ ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
+.endif
+
+#
# --=3D=3D## Put a filesystem into a BOOTMFS kernel ##=3D=3D--
#
doMFSKERN:
@echo "Running ${.TARGET} for ${FSIMAGE}"
@rm -f ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE}
+ @cd ${.CURDIR} && ${MAKE} createBOOTMFS
cd ${.CURDIR}/..; \
KERNEL_KO=3DBOOTMFS KODIR=3D \
${CROSSMAKE} ${KERNEL_FLAGS} -DNO_WERROR -DNO_MODULES -DNO_KERNELCLEA=
N \
%%%
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
--BOKacYhQ+x31HxR3
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
iD8DBQE87epDUkv4P6juNwoRAlbZAJ9kOA7oor9YCIi4k3A1F2VyEt4eZQCgi3qS
9sJ8NNW0qSDRSAyADCa9jH0=
=ykKb
-----END PGP SIGNATURE-----
--BOKacYhQ+x31HxR3--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020524072243.GA81964>