1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-30 12:04:07 +00:00
Commit Graph

80 Commits

Author SHA1 Message Date
Luigi Rizzo
5d97a228a8 add a missing -o.
There might be some other bug related to OBJDIR handling, once
fixed these changes can be MFC immediately.
2001-08-30 21:39:14 +00:00
Luigi Rizzo
a39c93813c Move handling of crunch* files into Makefile.conf, which is a
better place to handle dependencies.

Make another step at helping cross-compiling: when the user specifies
an alternate source tree, the script takes care of creating include
files and libraries for the new tree.
Furthermore, build and use a version of the "config" program which
matches the new sources.

It takes a long time to create libraries, and it might even not do
the right thing at once, there might be some dependencies that i
have forgotten. At any rate, with this code i have been able to
build a working picobsd image using -CURRENT sources on -STABLE

MFC after: 3 days
2001-06-21 08:49:46 +00:00
Luigi Rizzo
da485c53a9 Move variable assignement after argument parsing, to improve handling
of alternate source trees.

Also improve verbose behaviour.
2001-06-20 14:16:48 +00:00
Luigi Rizzo
630802eb2a Sync picobsd script with the one in -stable, and also
patch boot2 so it goes to load /kernel right away

Perl code from Josef Karthauser
2001-05-11 07:39:40 +00:00
Luigi Rizzo
f07e0883ca remove a reference to a nonexisting script, "clean", when
building all images. Also, build "bridge" image as well.

Reported-by: Bruce Montague
2001-05-08 20:44:37 +00:00
Josef Karthauser
18668d0278 MF4S: Sync with the developments that Luigi's been doing in -stable. 2001-04-23 19:55:03 +00:00
Josef Karthauser
7bba070f1c MF4S: Remove some unused error messages. (revision 1.1.2.5) 2001-04-23 19:52:13 +00:00
Josef Karthauser
b8ff2fec46 MFS4: Do not terminate if it fails to clean something. (rev 1.12.2.5) 2001-04-22 23:58:46 +00:00
Luigi Rizzo
25801a0e8b Bring the new script into -current. Still untested here, but there
is a high chance that they work modulo minor things.
2001-02-20 17:09:40 +00:00
Luigi Rizzo
b8c84b6286 Make correct entries for atapi disks 2001-02-18 06:50:40 +00:00
Luigi Rizzo
a0ab7f4419 Put picobsd build scripts in sync with the ones in -STABLE.
With these scripts i was able to build a _working_ image of a
bridge-like floppy image with a reasonable set of utilities
in it, despite the code size increase we have in 5.0

The scripts are slightly different from the previous ones especially
on the place where the kernel and binaries are built. Hopefully
this will not cause too much trouble to people (is there any???)
using the old scripts.
2001-01-29 22:47:46 +00:00
Josef Karthauser
e1f903baf7 MF4: Allow the build process to continue even if crunchgen returns an error.
Most crunchgen errors are non-fatal.
2001-01-11 22:35:57 +00:00
Josef Karthauser
1826f66757 Remove floppy.tree from the build directory. 2000-12-23 19:33:13 +00:00
Josef Karthauser
04dbe0f9b9 Determine the names of the picobsd releases automatically.
Use the 'realclean' target in the crunch.mk file for cleaning the object
build tree.
2000-12-23 16:53:35 +00:00
Josef Karthauser
5e75ac9fe2 Utilise the -p file to crunchgen to specify where the objects should
be built and remove the previous glue that did the same thing.
2000-12-18 16:28:03 +00:00
Josef Karthauser
d08c457148 Fixup the /tmp directory permissions to 01777.
PR:     misc/15875
2000-11-07 20:40:21 +00:00
Josef Karthauser
57b8982cca Load the kernel and root file systems from floppy:/. 2000-11-07 12:33:46 +00:00
Josef Karthauser
c6e77fea54 Crunchgen now has the necessary magic to include the make hooks that
munge_crunchmk was adding for us.
2000-11-03 15:50:04 +00:00
Josef Karthauser
095aac1a86 Fold the buildopts into the existing crunch.inc file.
Deprecate the "global" crunch.inc file and the CRUNCHFLAGS global build
options.  Tools not policy.  Move these global settings out into each
picobsd distribution.
2000-11-03 01:33:03 +00:00
Josef Karthauser
be0d2a8f18 Build picobsd object files in /usr/obj/picobsd/${TYPE}. 2000-11-02 13:38:10 +00:00
Josef Karthauser
a5e7d98e8a Post process the crunch1.mk file to allow make arguments to passed on
a per program basis allowing a greater control on what is built.

The buildopts file contains Makefile lines of form:

	# Anything added to OPTS is added to every build rule.
	OPTS= -DNOPAM

	# These should only be added to the build of user-ppp.
	ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID \
		-DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH

Really these should be added to crunch.inc, but that file is currently
optional, and if defined masks the global one.  Next step will be to move
these global settings back out into the individual builds as OPTS, and
then migrate OPTS and prog_OPTS back into the local crunch.inc file.
2000-11-02 13:16:43 +00:00
Josef Karthauser
c7afc3e07c Remove an unneeded declaration for OBJ. 2000-11-02 12:46:02 +00:00
Josef Karthauser
0a007e03a9 Copy the built kernel from the right place. (Forgotten in the last
commit.)
2000-11-02 01:57:23 +00:00
Josef Karthauser
72d93b8e80 Build the PICOBSD kernels using the 'make buildkernel' method. 2000-10-16 08:08:31 +00:00
Josef Karthauser
1e2b0ddcfa Fix the PICOBSD kernel configs. They're now converted to use
Peter's new format, and I'd added hints files for each.

The build process uses the PICOBSD.hints file as well as the config,
and additionally builds with -DNO_MODULES.  The build process
probably needs to be converted to use the 'buildkernel' method
instead of running config itself.

The kernels now compile.  I've not been able to test the crunch
process however because it used the vn driver and there are no
/dev/vn device nodes under devfs yet.  Maybe someone else could
give it a go.
2000-10-15 20:42:22 +00:00
Marcel Moolenaar
11017a687b Backout addition of -L switch to mtree. Using -L breaks the
build process in too many cases. Adding mtree to bootstrap-tools
to solve this breaks the upgrade path because mtree needs a
libc that has strtofflags and fflagstostr.
2000-07-23 16:33:00 +00:00
Andrey A. Chernov
8b873d926b Add -L to mtree.
Not shure ever it needed for MFS, but just to keep old behaviour exact, can be
removed later
2000-07-16 08:44:40 +00:00
Roger Hardiman
7bae8dfb17 Add .image.list to the list of temporary files which can be deleted 2000-07-01 13:51:22 +00:00
Roger Hardiman
5bbd55b415 Add 'bridge' so we can clean up the bridge files too 2000-07-01 04:40:01 +00:00
Doug White
223b633217 Commit PicoBSD mega-patch:
. Bring PicoBSD up to date with -CURRENT reality.
. Make PicoBSD smart and not spam /dev/vn0 and /mnt.  Now it uses the first
  unused vn device and creates a temporary mountpoint in /tmp.
. Miscellaneous build cleanups and optimizations.

Unfortunately the bridge, isp, and router floppies are too big and need
the axe treatment.  The install floppy needs updating to -CURRENT. Dial and
net build and (appear to) run OK.  I will be adressing these in the
near future (unless someone beats me to it :-) ).

PR:		misc/17737
Submitted by:	Omachonu Ogali <oogali@intranova.net>
2000-04-25 19:00:08 +00:00
Luigi Rizzo
c97822e186 Add global version of mfs.mtree -- this is common to most floppy types
Approved-by: jordan
2000-02-08 11:39:28 +00:00
Luigi Rizzo
bdc410e54d Add a new file to be included by the makefiles used by crunchgen
(this is a convenient place to put Make variables until we add a -D
option to crunchgen).

Approved-By: jordan
2000-02-08 08:29:18 +00:00
Luigi Rizzo
d13031514e The Makefile for building the crunched image is the same
for almost all images, so let's have a centralized copy.

Approved-By: jordan
2000-02-08 08:27:55 +00:00
Luigi Rizzo
f908e29f8d Cleanup the build scripts.
Approved-by: jordan
2000-02-08 08:25:00 +00:00
Greg Lehey
4b61b305c0 Handle building individual targets better. It's still broken; the
only way to be sure the build works correctly is to do a 'make all'.
But with these changes, it's easier to test individual targets.  In
particular, ensure that the vnode file systems are mounted before
writing to them.

Ensure that we don't get CVS directories on our floppies.

Use kgzip instead of kzip to compress the loader.  This saves a few
kB.

Remove some test cruft.
1999-12-20 02:07:42 +00:00
Jordan K. Hubbard
b99df5acb5 Correct slight stuff-up in previous patch. 1999-12-16 02:14:30 +00:00
Jordan K. Hubbard
bb0ea411a8 Update to use MD disk instead of MFS 1999-12-16 02:08:52 +00:00
Greg Lehey
2bdf2cff05 Add 'custom' directory with significantly restructured build (now
using make instead of custom scripts) and two floppies instead of
one.  The resultant floppy can do everything that the individual
floppies (dial, net, install, isp, router) could do, modulo some bit
rot that has occurred since PicoBSD last compiled.  It also includes
all the programs on the fixit floppy, which could thus also die.

/bin currently contains the following files:

-sh             dump            ln              ns              sps
[               ed              login           ping            stty
badsect         ex              ls              ps              swapon
cat             expr            mkdir           pwd             sync
chgrp           fdisk           mknod           pwd_mkdb        sysctl
chmod           find            more            rdump		syslogd
chown           fsck            mount           reboot          tar
chroot          ftp             mount_cd9660    restore         telnet
clri            getty           mount_msdos     rlogin		telnetd
cp              grep            mount_nfs       rm              test
date            gunzip          mount_std       rmdir		traceroute
dd              gzip            msg             route           umount
dev_mkdb        hostname        mt              routed          vi
df              ifconfig        mv              rrestore        view
dhclient        inetd           natd            rsh             vm
dhclient-script init            netstat         sed             w
disklabel       kget            newfs           sh              zcat
dmesg           kill            nfs             sleep

Structure is in place for using the same build for the other
directories, but I'm no longer sure we need this.  The current first
floppy will run fine by itself, but the size of a compressed kernel
has increased by nearly 50% since 3.2, and there's not much space for
anything useful on the remainder of the floppy.  The current method
creates a larger mfs and can read as many floppies as the user can
stand.  The footprint appears to be round 14 MB.

Work-sponsored-by:    Sitara Networks Inc.
1999-12-10 21:43:10 +00:00
Pierre Beyssac
58387d7595 A (harmless) forgotten MFS_ROOT -> MD_ROOT. 1999-11-30 21:41:11 +00:00
Doug White
96df778049 Change MFS sizes to 2400k since gzip will compact free space anyway.
Add 'install' to the internal floppy type list.
1999-10-20 04:48:35 +00:00
Doug White
eb5fe92141 Reverse the sense of the /mnt/boot/defaults dir check. This was causing
the bootloader to not load the loader.conf and thus the MFS image.  The result
was 'panic: no init'.
1999-10-17 22:42:57 +00:00
Doug White
5c52794973 Fix handling of the 'custom' directory symlink.
Properly abstract the PicoBSD build directory instead of depending too much
on pwd's and relative paths.

Submitted by:	 John Baldwin <jobaldwi@vt.edu>
1999-10-11 20:52:50 +00:00
Doug White
3eaa4cd425 Be explicit about kzip location to avoid accidentally calling KDE kzip. 1999-10-11 05:13:52 +00:00
Doug White
88e4dbacdb Add a new floppy type, install. This type builds a disk that can
slice, partition, newfs, and install FreeBSD from a tarball on a remote server.
Handy for doing mass-installs for server farms.

Documentation following shortly.
1999-10-08 04:00:21 +00:00
Doug White
0a2478e155 Remove tee from stage1 call. You can't capture the return code from stage1
(easily) so it gives false 'success' indications.
1999-08-29 19:16:29 +00:00
Doug White
a17382473e MFS: Dialog-ify 'reuse custom directory' question. 1999-08-29 19:11:11 +00:00
Roger Hardiman
fc7998f35f Backout my last commit. Exit status is $? 1999-08-28 08:04:15 +00:00
Peter Wemm
97d92980a9 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
Roger Hardiman
3795f47b11 'build' calls 'stage1'
The check for the exit status of the 'stage1' script was broken.
Change "X$?" != "X0" to "X?" != "X0"
1999-08-27 07:41:25 +00:00
Doug White
722eb6eda0 Add missing quote. 1999-08-25 01:12:55 +00:00