Date: Tue, 22 Jul 2003 21:50:05 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: John Baldwin <jhb@FreeBSD.org> Cc: current@FreeBSD.org Subject: Re: make release broken [FIX] Message-ID: <20030722185005.GC80514@sunbay.com> In-Reply-To: <XFMail.20030722144552.jhb@FreeBSD.org> References: <20030722183730.GA80514@sunbay.com> <XFMail.20030722144552.jhb@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On Tue, Jul 22, 2003 at 02:45:52PM -0400, John Baldwin wrote:
>
> On 22-Jul-2003 Ruslan Ermilov wrote:
> > On Tue, Jul 22, 2003 at 02:26:34PM -0400, John Baldwin wrote:
> >>
> >> On 22-Jul-2003 Ruslan Ermilov wrote:
> >> > Hi!
> >> >
> >> > As many of you probably know, recent telnet commit broke snapshot
> >> > building. Since I needed a working "make release" to go on with
> >> > my task on floppy-less "make release" (for AMD64, etc.), I had to
> >> > just fix it. Attached is the patch. It also fixes another issue
> >> > with this telnet commit: it ensures that crypto telnet[d] do not
> >> > end up in the "base" distribution.
> >>
> >> Why not simply enable 'NO_FLOPPIES' on the arch's that don't want
> >> floppies?
> >>
> > Because NO_FLOPPIES doesn't mean like it sounds; it means "do not
> > create floppy _images_", and we want to skip much more than that.
> > I have a preliminary patch that is currently under the "make
> > release" test. Let me know (or anyone else) if you want to review
> > it or the final version before I commit it.
>
> Are you eliminating the mfsroot?
>
Yes.
> All the bootable CD's use
> that right now, so what more are you doing than eliminating
> the floppy images?
>
Part of the patch for the iso.1 target has this (cut-n-pasted):
@@ -885,10 +873,7 @@
.if ${TARGET} != "pc98"
@echo "Setting up /boot"
@rm -f ${CD_DISC2}/boot/loader.conf
- @cp ${RD}/mfsroot/mfsroot.gz ${CD_DISC2}/boot/mfsroot.gz
- @echo 'mfsroot_load="YES"' > ${CD_DISC2}/boot/loader.conf
- @echo 'mfsroot_type="mfs_root"' >> ${CD_DISC2}/boot/loader.conf
- @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf
+ @echo 'init_path="/usr/sbin/sysinstall"' > ${CD_DISC2}/boot/loader.conf
@cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
.endif
.if !defined(NOPORTS)
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software Ltd,
ru@FreeBSD.org FreeBSD committer
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE/HYddUkv4P6juNwoRAoprAJ9oNh0pdU9HYvsZ/hnie108gzs63wCgjMk3
mCutx2rr8rgbeqgoVw1cqwM=
=XtDW
-----END PGP SIGNATURE-----
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030722185005.GC80514>