From owner-cvs-all@FreeBSD.ORG Sat Feb 26 22:20:34 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB40A16A4CE; Sat, 26 Feb 2005 22:20:34 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1859443D62; Sat, 26 Feb 2005 22:20:34 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j1QMKSRA046974; Sun, 27 Feb 2005 00:20:28 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 79032-09; Sun, 27 Feb 2005 00:20:27 +0200 (EET) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j1QMKQAO046971 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 27 Feb 2005 00:20:27 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id j1QMKagi055649; Sun, 27 Feb 2005 00:20:36 +0200 (EET) (envelope-from ru) Date: Sun, 27 Feb 2005 00:20:35 +0200 From: Ruslan Ermilov To: Joe Marcus Clarke Message-ID: <20050226222035.GD93910@ip.net.ua> References: <200502222329.j1MNTskQ089307@repoman.freebsd.org> <20050226204051.GA51467@ip.net.ua> <1109454759.53375.19.camel@shumai.marcuscom.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oj4kGyHlBMXGt3Le" Content-Disposition: inline In-Reply-To: <1109454759.53375.19.camel@shumai.marcuscom.com> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new at ip.net.ua cc: Jeremy Messenger cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: cvs-src@FreeBSD.org Subject: Re: 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2005 22:20:35 -0000 --oj4kGyHlBMXGt3Le Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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): >=20 > cd ${SRCBASE} > mkdir -p ${D} > env DESTDIR=3D${D} make world >=20 > if [ $? !=3D 0 ]; then > echo "ERROR: make world failed. See above output." > exit 1 > fi >=20 > cd etc > make distribution DESTDIR=3D${D} >=20 > if [ $? !=3D 0 ]; then > echo "ERROR: make distribution failed. See above output." > exit 1 > fi >=20 > What is meant by an "upgrade" in this context, and how exactly should I > be building a full FreeBSD jail? >=20 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=3D 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 =20 +distribution: + cd ${.CURDIR}/etc; ${IMAKE} distrib-dirs + # # libraries - build all libraries, and install them under ${DESTDIR}. # Index: usr.sbin/jail/jail.8 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=3D$D -cd etc make distribution DESTDIR=3D$D mount_devfs devfs $D/dev cd $D %%% Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --oj4kGyHlBMXGt3Le Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFCIPYzqRfpzJluFF4RAoC4AJ9UYg5y6x6EyeCKmV/87khKRY0n4QCdHFmT t+yKvQvYPj6Nzl3Nj/7yHpg= =i0SE -----END PGP SIGNATURE----- --oj4kGyHlBMXGt3Le--