cvs commit: src Makefile.inc1 src/share/mk Makefile bsd.endian.mk src/usr.bin/cap_mkdb cap_mkdb.1 cap_mkdb.c src/share/termcap Makefile src/usr.bin/vgrind Makefile

[Ruslan Ermilov]

On Sat, Feb 26, 2005 at 04:52:39PM -0500, Joe Marcus Clarke wrote:
> I'm a bit confused.  My script downloads the source, and does a fresh
> make world followed by a make distribution (almost exactly how it's
> documented in the jail(8) man page):
> 
> cd ${SRCBASE}
> mkdir -p ${D}
> env DESTDIR=${D} make world
> 
> if [ $? != 0 ]; then
>     echo "ERROR: make world failed.  See above output."
>     exit 1
> fi
> 
> cd etc
> make distribution DESTDIR=${D}
> 
> if [ $? != 0 ]; then
>     echo "ERROR: make distribution failed.  See above output."
>     exit 1
> fi
> 
> What is meant by an "upgrade" in this context, and how exactly should I
> be building a full FreeBSD jail?
> 
By "upgrade" I mean when your sources do not match your installed
world, e.g., when you're trying to populate jail(8) with today's
sources using yesterday's world.

During the buildworld/installworld we bootstrap several utilities.
For example, cap_mkdb(8) was recently updated to handle different
endianness needed to be used as a tool in cross-build environment.
src/share/termcap/Makefile was modified accordingly and is called
as part of "make distribution" from src/etc/Makefile.

For "make distribution" to work correctly in upgrade environment,
it should be supplied such an environment.  This patch does this:

%%%
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/Makefile,v
retrieving revision 1.316
diff -u -r1.316 Makefile
--- Makefile	26 Feb 2005 22:02:18 -0000	1.316
+++ Makefile	26 Feb 2005 22:14:37 -0000
@@ -63,7 +63,8 @@
 # completely subject to change without notice.
 #
 TGTS=	all all-man buildenv buildkernel buildworld checkdpadd clean \
-	cleandepend cleandir depend distribute distributeworld everything \
+	cleandepend cleandir depend distribute distributeworld \
+	distribution everything \
 	hierarchy install installcheck installkernel installkernel.debug\
 	reinstallkernel reinstallkernel.debug installworld \
 	kernel-toolchain libraries lint maninstall \
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.478
diff -u -r1.478 Makefile.inc1
--- Makefile.inc1	26 Feb 2005 22:02:18 -0000	1.478
+++ Makefile.inc1	26 Feb 2005 22:14:37 -0000
@@ -930,6 +930,9 @@
 hierarchy:
 	cd ${.CURDIR}/etc;		${MAKE} distrib-dirs
 
+distribution:
+	cd ${.CURDIR}/etc;		${IMAKE} distrib-dirs
+
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.
 #
Index: usr.sbin/jail/jail.8
===================================================================
RCS file: /home/ncvs/src/usr.sbin/jail/jail.8,v
retrieving revision 1.61
diff -u -r1.61 jail.8
--- usr.sbin/jail/jail.8	8 Feb 2005 21:31:11 -0000	1.61
+++ usr.sbin/jail/jail.8	26 Feb 2005 22:16:06 -0000
@@ -33,7 +33,7 @@
 .\"
 .\" $FreeBSD: src/usr.sbin/jail/jail.8,v 1.61 2005/02/08 21:31:11 cperciva Exp $
 .\"
-.Dd April 8, 2003
+.Dd February 27, 2005
 .Dt JAIL 8
 .Os
 .Sh NAME
@@ -119,7 +119,6 @@
 cd /usr/src
 mkdir -p $D
 make world DESTDIR=$D
-cd etc
 make distribution DESTDIR=$D
 mount_devfs devfs $D/dev
 cd $D
%%%


Cheers,
-- 
Ruslan Ermilov
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/cvs-src/attachments/20050227/a8734a8c/attachment.bin