Commit Graph

700 Commits

Author SHA1 Message Date
John Hay
4ecb22fb96 Remove a stray ';'. 2002-08-09 08:22:02 +00:00
John Hay
ec60346065 Remove a '-' that is not needed.
Submitted by:	ru
2002-08-09 08:18:15 +00:00
John Hay
407ac59af3 Add a third floppy to releases. It will only be built if there is a
release/${TARGET}/drivers.conf file which list drivers that have to
go into the third floppy.

Also shuffle i386/drivers.conf so that the floppies don't overflow
anymore. Anybody with real/better usage statistics is welcome to
shuffle it differently.

Reviewed by:	ru
2002-08-09 07:45:42 +00:00
Ruslan Ermilov
93c10c2246 Stop eating all process memory if either of ${.CURDIR}/../kerberosIV
or ${.CURDIR}/../kerberos5 does not exist.

Spotted by:	Alexandr Listopad <laa@reis.zp.ua>
MFC after:	3 days
2002-08-05 16:57:43 +00:00
Ruslan Ermilov
8d785bd77c The side effect of revision 1.687 (env -i) was that many useful knobs
are no longer propagated to the chrooted environment, e.g. NOKERBEROS.
On the other hand, TMPDIR and MAKEOBJDIRPREFIX should no longer be.

Spotted by:	Alexandr Listopad <laa@reis.zp.ua>
2002-08-05 16:46:14 +00:00
Ruslan Ermilov
095b49ff6d Catch up to the rev. 1.694 changes; WITHOUT_X11 is not anymore set in
the environment.
2002-08-02 16:23:20 +00:00
John Baldwin
bb5e8f3f71 If we are building docs with this release and PREFETCHDISTFILES is defined
then download the distfiles for the ports needed to build the docs before
we enter the chroot environment.  This is useful since often times releases
get in a funk trying to download distfiles in the chroot.

Approved by:	re (murray, bmah)
MFC after:	5 days
2002-07-27 19:43:52 +00:00
Ruslan Ermilov
da037ed335 Build FDP ports with a clean runtime environment; gmake(1) somehow
uses ${TARGET_ARCH}, in a way that is incompatible with our usage.

Submitted by:	jhay, ru
2002-07-26 11:27:11 +00:00
Ruslan Ermilov
de9a18ceec Braino in the 1.672 commit: scripts/games-make.sh expects the
"manpages" and "catpages" dists to be already built.
2002-07-25 14:42:08 +00:00
Ruslan Ermilov
3cb04a4d39 Copy the right dhclient-script(8). 2002-07-24 20:37:21 +00:00
Ruslan Ermilov
74064f9fac Fix ${TMAKE} to use the correct .mk files.
Removed stray -DNO_WERROR's.
2002-07-12 15:15:35 +00:00
Ruslan Ermilov
fc6866d767 Do not override the CFLAGS with its standard value. At some point,
different architectures may choose to use different default values
for CFLAGS, for example.  (It was added in rev. 1.200 as a measure
to make boot images fit the floppies, and was never reverted.)
2002-07-11 16:27:04 +00:00
Ruslan Ermilov
c0db9f0e13 Part 2/2 of the kerberos5/doc/ "make release" breakage fix:
Make sure the "krb5" does not have the /usr/share/info/dir,
or it will clobber the "base" version on install.
2002-07-06 15:00:07 +00:00
Tom Rhodes
23ef6da7d2 Fix a typo: s/und/and/
Not Reviewed by:	re@
2002-07-03 18:04:10 +00:00
Makoto Matsushita
dafdb1b4c5 Set PATH statically, and use 'env -i' to kick chroot(8). As a result,
the second buildworld environment is fully isolated from parent's
environment variables.

Tested virtually on: snapshots.jp.FreeBSD.org
Approved by:	arch@ (silently)
MFC after:	2 weeks
2002-06-19 15:06:38 +00:00
Makoto Matsushita
04b9282ff8 Explicitly set TARGET and TARGET_ARCH in a chroot sandbox.
In fact, these variable are set as environment variables since we run
"make TARGET=xxx TARGET_ARCH=xxx"; TARGET and TARGET_ARCH are declared
in the command line arguments.  However, if you are not make(1) guy,
it is hard to understand that TARGET/TARGET_ARCH are appropriately set
in a chroot environment (as environment variables).

Now, the only environment variable need to be set explicitly is 'PATH'.
If we set PATH in /mk script, we can make pristine sandbox for release
build (i.e., "env -i /usr/sbin/chroot ${CHROOT} /mk" will work).

Valuable comments about this issue from: ru
Tested on (virtually): snapshots.jp.FreeBSD.org
MFC after:	2 weeks
2002-06-08 03:15:50 +00:00
Yoshihiro Takahashi
4ffc41abdd Install MD documentations in ${TARGET} directory instead of ${TARGET_ARCH}. 2002-06-04 12:05:29 +00:00
Ruslan Ermilov
b1a8a1813f Change the ">>> make release ..." output to also include ${TARGET}. 2002-05-27 10:59:41 +00:00
Ruslan Ermilov
2efba2d1d7 Fixed the nasty bug I introduced in rev. 1.671 that got
fatal in the previous delta.  Repeat after me: exists()
is executed at parse time.
2002-05-27 10:52:03 +00:00
Ruslan Ermilov
319f35a37c PC98 creates different BOOTMFS configs for different floppy sizes.
Broken in:	rev. 1.672
Spotted by:	nyan
2002-05-25 16:13:52 +00:00
Ruslan Ermilov
08198a0e3e Convert Perl scripts to awk(1). 2002-05-24 11:03:41 +00:00
Bruce A. Mah
2541b18f25 Build ports needed for release documentation WITHOUT_PYTHON. 2002-05-18 00:00:41 +00:00
Ruslan Ermilov
ff85b6e3eb Split release.2 into two stages. release.2 now install the base
dist, while release.3 makes and installs crypto, krb4, and krb5
dists.  This makes release.3 restartable (with "make rerelease").
2002-05-14 13:59:33 +00:00
Ruslan Ermilov
61c2d47ae5 Make sure the first ${CHROOTDIR} installworld is done for the correct
arch.  This makes "make release TARGET_ARCH=foo" really work.

(I only tested with "make rerelease" before to save some time and did
not notice the problem.)
2002-05-14 13:45:50 +00:00
Ruslan Ermilov
7758617eb4 GC now redundant BOOTSTRAPUTILS stuff. 2002-05-14 13:41:18 +00:00
Ruslan Ermilov
8f1f55e9ae Milestone #2 in cross-arch make releases. They now work!
You need to set TARGET_ARCH and possibly TARGET, the same
way you normally do it for a cross build(7).

Renamed `distribworld' to a more natutal `distributeworld'.

Put pwd_mkdb(8) under ${INSTALLTMP}; for `distributeworld'.
2002-04-30 11:50:01 +00:00
Ruslan Ermilov
58888af364 Some components of the crunched binaries may use build-tools
that are to be run on the building host.  (Currently, bin/sh
and usr.sbin/sysinstall use them.)  Make sure we build them
in the correct environment, like we do it in the buildworld.
2002-04-29 15:26:37 +00:00
Makoto Matsushita
2b3f8b22db Introduce CVSCMDARGS make variable to set command-line options for cvs.
You may want set '-D data-spec' to this variable.

PR:		31218
Submitted by:	Alexandr Listopad <laa@laa.zp.ua>
MFC after:	5 days
		(if re@ permits)
2002-04-27 14:23:32 +00:00
Ruslan Ermilov
f3fb4a79be If we are making a "release", we can obviously use -DNOCLEAN buildworld,
to save some time, because ${CHROOTDIR}/usr/obj does not even exist.
2002-04-26 19:40:45 +00:00
Ruslan Ermilov
6bde859f40 Milestone #1 in cross-arch make releases.
Do not install games and profiled libraries to the ${CHROOTDIR}
with the initial installworld.

Eliminate the need in the second installworld.  For that, make sure
_everything_ is built in the "world" environment, using the right
tool chain.

Added SUBDIR_OVERRIDE helper stuff to Makefile.inc1.  Split the
buildworld process into stages, and skip some stages when
SUBDIR_OVERRIDE is set (used to build crypto, krb4, and krb5
dists).

Added NO_MAKEDB_RUN knob to Makefile.inc1 to avoid running
makewhatis(1) at the end of installworld (used when making crypto,
krb4, and krb5 dists).

In release/scripts/doFS.sh, ensure that the correct boot blocks are
used.

Moved the creation of the "crypto" dist from release.5 to
release.2.

In release.3 and doMFSKERN, build kernels in the "world"
environment.  KERNELS now means "additional" kernels, GENERIC is
always built.

Ensure we build crunched binaries in the "world" environment.
Obfuscate release/Makefile some more (WMAKEENV) to achieve this.

Inline createBOOTMFS target.

Use already built GENERIC kernel modules to augment mfsfd's
/stand/modules.  GC doMODULES as such.

Assorted fixes:

Get rid of the "afterdistribute" target by moving the single use
of it from sys/Makefile to etc/Makefile's "distribute".

Makefile.inc1: apparently "etc" no longer needs to be last for
"distribute" to succeed.

gnu/usr.bin/perl/library/Makefile.inc: do not override the
"install" and "distribute" targets, do it the "canonical" way.

release/scripts/{man,cat}pages-make.sh: make sure Perl manpages and
catpages appear in the right dists.  Note that because Perl does
not respect the MANBUILDCAT (and NOMAN), this results in a loss of
/usr/share/perl/man/cat* empty directories.  This will be fixed
soon.

Turn MAKE_KERBEROS4 into a plain boolean variable (if it is set it
means "make KerberosIV"), as documented in the make.conf(5)
manpage.  Most of the userland makefiles did not test it for "YES"
anyway.

XXX Should specialized kerberized libpam versions be included into
the krb4 and krb5 dists?  (libpam.a would be incorrect anyway if
both krb4 and krb5 dists were choosen.)

Make sure "games" dist is made before "catpages", otherwise games
catpages settle in the wrong dist.

Fast build machine provided by: Igor Kucherenko <kivvy@sunbay.com>
2002-04-26 17:55:27 +00:00
Ruslan Ermilov
b6ea96d1d5 Build the catpages distribution in a more natural way. 2002-04-24 12:54:34 +00:00
Ruslan Ermilov
da40970fa0 The chrooted environment isn't nearly pristine, so reset
MAKEOBJDIRPREFIX to the canonical /usr/obj while there.
2002-04-24 12:51:48 +00:00
David E. O'Brien
01df2ec328 Change the name of the 'bin' distribution to 'base'.
This is done since it contains much more than /bin, and also gets in the
way when making a combined install+fixit CD.

OK'ed by:	jkh
2002-04-23 22:16:41 +00:00
Ruslan Ermilov
dcd88dc271 Do not spam initial ${CHROOTDIR} world with Texinfo and HTML docs.
For rerelease, run "make -DNOCLEAN world" instead of simple and
insufficient in some cases "make all install".  This is especially
true for cross-arch "make release"s which we don't (yet) support.
2002-04-23 09:24:00 +00:00
Makoto Matsushita
1665df2994 Set hint.acpi.0.disable to 1 in /boot/loader.rc of {boot,kern}.flp,
since we have no ACPI feature in the installation kernel at this time.

Without having this, we'll see

	ACPI no autoload failed -- no such file or directory

message at boot time, and it makes some confusion to the users.  We can
backout this change if installation kernel has ACPI feature.

PR:		36911 (partly)
2002-04-09 01:17:47 +00:00
Makoto Matsushita
203f3bd49f Fix recent fixit.flp flood:
- don't make device files since we are in the DEVFS era.
	  (for the last resort, fixit.flp still has /dev/MAKEDEV.)
	- increase FIXITINODE size to 10 times (40000).

After this change, we have 42kbytes of free space, and 38
of free inodes (confirmed with 5.0-CURRENT-20020327-JPSNAP).

Since 4-stable doesn't have DEVFS, we can't MFC this (except FIXITINODE).
2002-04-02 15:07:34 +00:00
Murray Stokely
9a0c70235d Make it easier to specify a custom kernel configuration for the boot
floppies.

PR:		misc/36032
Submitted by:	David Yeske <dyeske@yahoo.com>
MFC after:	1 week
2002-03-31 17:21:29 +00:00
Murray Stokely
ac95fa5040 Bump MFSSIZE to the value used by i386 and pc98. This larger MFS
filesystem will still compress below the 1.44 megabyte threshold for
the floppy image.
2002-03-30 02:31:17 +00:00
Murray Stokely
37c973e3dd Alpha does not support PCCARD installs, so we do not need the 58k
/etc/defaults/pccard.conf.  Assume for now that only
MACHINE_ARCH=="i386" wants to do PCCARD installs.  We're still using
too much space, but this is a big help.
2002-03-29 22:22:34 +00:00
Ruslan Ermilov
c06157d49f Teach sysinstall(8) how to read boot managers out of /boot
instead of hardcoding them into the binary.  This replaces
the work-around in usr.sbin/sysinstall/Makefile,v 1.121.

Suggested by:	jhb
MFC in:		1 week
2002-03-28 08:23:33 +00:00
John Baldwin
ab0235da5d Remove all traces of write_mfs_in_kernel from the base system release
area.

Requested by:	joe
2002-03-26 18:12:26 +00:00
Murray Stokely
0874402d9e Remind developers to update release(7) if they make substantial
changes to this file.
2002-03-17 07:34:12 +00:00
Peter Wemm
394015a422 Supply -DNO_WERROR to the kernel build during release. 2002-02-25 21:53:18 +00:00
Makoto Matsushita
d7c4abbf21 Typo fix: missing ;.
Pointed out by: Manfred Antar <null@pozo.com>
Pointy hat to: matusita
2002-02-25 05:35:39 +00:00
Makoto Matsushita
b389e7aaef Mkdir ${CHROOTDIR}/usr/ports/distfiles if RELEASEDISTFILES is not set.
We ensure that 'ports.tgz' tarball should have ports/distfiles directory.

At first, ${CHROOTDIR}/usr/ports is empty (rm -rf ports), then extract
ports files from CVS repository.  Then if RELEASEDISTFILES is defined,
${CHROOTDIR}/usr/ports/distfiles directory is created by cp(1).  However,
if you don't specify RELEASEDISTFILES, there is no chance to create
${CHROOTDIR}/usr/ports/distfiles directory.

Submitted by:	{ushi,tora}.jp.FreeBSD.org
MFC after:	5 days
2002-02-12 16:56:06 +00:00
Makoto Matsushita
40227c902b Change variable name from DOCDISTFILES to RELEASEDISTFILES. Respect
DOCDISTFILES if defined.  No impact should happen with this change.

DOCDISTFILES is introduced by rev. 1.541, to point the directory that
contains the distfiles for ports/textproc/docproj.  It's good, but
we also build ports/sysutils/mkisofs during the release (if MAKE_ISOS
is defined).  It is natural that cdrtools tarball is prefetched, then
copy it under ${CHROOTDIR}/usr/ports/distfiles.

As a result, DOCDISTFILES variable is somewhat abused for non-doc
tarballs; *DOC*DISTFILES is no longger appropriate name for that.

PR:		16843
PR:		34194
Submitted by:	murray
MFC after:	6 days
2002-02-03 07:00:37 +00:00
Makoto Matsushita
65718a83c9 In revision 1.351, All files/directories in ${CHROOTDIR}/usr/ports/distfiles
are removed, because ports.tgz includes distfiles by accident.

However, removing files/directories is *not* mandatory.  The only
requirement is "ports.tgz doesn't include distfiles/* but distfiles
directory itself".  If this is correct, the right way is to set an
option to tar(1), not to include these files.

This commit is based on PR: 34194, but a little bit of modification
is made by me (original patch doesn't include 'distfiles' directory).

PR:		34194
Reviewed by:	Adrian Steinmann <ast@marabu.ch> (PR submitter)
MFC after:	9 days
2002-01-31 00:38:09 +00:00
Makoto Matsushita
4b60693c3c MFS 1.536.2.52 (partial) and 1.536.2.70: kgzip loader if i386 (only).
5.0-CURRENT-20020121-JPSNAP was failed to build since kern.flp has no
space.  There is already a hack to kgzip loader, and it makes:

-r-xr-xr-x  1 root  wheel  163840 Jan 21 07:40 loader*
-r-xr-xr-x  1 root  wheel   90121 Jan 21 08:06 loader.kgz*

73719 bytes of free spaces to us.
2002-01-20 23:17:52 +00:00
Joerg Wunsch
b0b18a1cb8 Include /dev/xpt0 into the list of devices to go onto the boot floppy, so
camcontrol can get a handle to initiate a rescan or reset.

MFC after:	1 week
2002-01-17 20:29:02 +00:00
Bruce A. Mah
febbbc6727 Modify the release-building process so the srelease distribution
doesn't get spammed by RELNOTESng files.

Previously, we built the RELNOTESng files "in place" and then
populated the media (e.g. floppy, cdrom, ftp) areas from the build
directories.  However, the distributions got rolled after the
RELNOTESng build, and thus picked up the rendered RELNOTESng files.

Now, we install the RELNOTESng documents to R/stage/release.doc, then
clean out the original directories in src/release/doc.  We use the
renditions in the staging area to populate the media areas.

PR:		33141
MFC after:	3 days
		(plus re approval)
2001-12-28 17:21:28 +00:00