make release broken [FIX]

[Ruslan Ermilov]

On Tue, Jul 22, 2003 at 03:07:01PM -0400, John Baldwin wrote:
> 
> >> Are you eliminating the mfsroot?
> >> 
> > Yes.
> 
> Ugh.
> 
> How does sysinstall work with this change?  You do realize that we
> mount the MFS as /, then mount the disk under /mnt, chroot to /mnt,
> then mount the CD in /dist in the chroot and install from there?
> Are you going to mount the CD as root or something?  It is probably
> a lot simpler to simply let sysinstall always execute in a MFS root.
> 
John, Warner,

At this stage it's obvious to me that we'd better with always
building mfsroot stuff, even for platforms that do not provide
floppy installation (AMD64).  As such, the following commit
would be in order, but as it falls under the "obrien vs ru"
category, I hereby ask (again) your permission to commit it:

%%%
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.790
diff -u -r1.790 Makefile
--- Makefile	23 Jul 2003 06:00:56 -0000	1.790
+++ Makefile	23 Jul 2003 06:02:11 -0000
@@ -985,14 +985,8 @@
 		   md5 * > CHECKSUM.MD5) \
 	)
 
-.if target(release.9.${TARGET_ARCH})
-RELEASE9=release.9.${TARGET_ARCH}
-.else
-RELEASE9=release.9 
-.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"
 
%%%

The release.9 target is responsible for creating mfsroot, amongst
other tasks.


Cheers,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru at sunbay.com		Sunbay Software Ltd,
ru at FreeBSD.org		FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20030723/58cdcd3c/attachment.bin