From owner-freebsd-current@FreeBSD.ORG Sat Aug 13 08:59:43 2005 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9828816A41F for ; Sat, 13 Aug 2005 08:59:43 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACB8843D46 for ; Sat, 13 Aug 2005 08:59:42 +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 j7D8xfJm045283; Sat, 13 Aug 2005 11:59:41 +0300 (EEST) (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 46703-13; Sat, 13 Aug 2005 11:58:14 +0300 (EEST) 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 j7D8wDC1045099 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 13 Aug 2005 11:58:13 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.3/8.13.3) id j7D8wE4S049709; Sat, 13 Aug 2005 11:58:14 +0300 (EEST) (envelope-from ru) Date: Sat, 13 Aug 2005 11:58:14 +0300 From: Ruslan Ermilov To: Brooks Davis Message-ID: <20050813085814.GB89765@ip.net.ua> References: <20050812223307.GE45385@obiwan.tataz.chchile.org> <20050812234227.GB22225@odin.ac.hmc.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="CUfgB8w4ZwR/yMy5" Content-Disposition: inline In-Reply-To: <20050812234227.GB22225@odin.ac.hmc.edu> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua Cc: freebsd-current@freebsd.org, Jeremie Le Hen Subject: Re: make distribution and cap_mkdb -l from 5 to 6 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2005 08:59:43 -0000 --CUfgB8w4ZwR/yMy5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Aug 12, 2005 at 04:42:27PM -0700, Brooks Davis wrote: > On Sat, Aug 13, 2005 at 12:33:08AM +0200, Jeremie Le Hen wrote: > > Hi, > >=20 > > I was giving a try to the sysutils/etcmerge port in order to ease the > > upgrade of /etc from RELENG_5 to RELENG_6. This revealed me that the > > ``distribution'' target in RELENG_6's src/etc/Makefile calls cap_mkdb(8) > > with either "-l" or "-L" flag, depending on endianess. Unfortunately > > RELENG_5's cap_mkdb(8) doesn't have this flag and this resulted. > >=20 > > I understand that using RELENG_6 sources on RELENG_5 is something quite > > unusual but it's quite disconcerting and prevents me from using > > etcmerge. I would really like to avoid merging /etc manually since I > > have number of changes in my /etc and number of changes between 5's /etc > > and 6's one are both huge. Yes, I know mergemaster(8), that's what I > > call ``manually'' :-). > >=20 > > Can this issue be resolved in a way or another ? I'm not sure using > > ${.OBJDIR}'s cap_mkdb(8) is an option. >=20 > I got bit by this today doing a nanobsd style cross build. I fixed it > by installing new cap_mkdb and pwd_mkdb's complied against the current > system, but with RELENG_6 sources. You shouldn't hit this problem with > an upgrade since the documented order is "make installworld" followed by > "mergemaster". Presumbly etcmerge should be run in the same place in > which case you'd be fine because *_mkdb would be updated. >=20 No. It's the nanobsd/Makefile that's broken: it runs "make distribution" directly from ${WORLDDIR}/etc, while to account for upgrades it should be run from ${WORLDDIR} (assuming a buildworld was run before that). Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --CUfgB8w4ZwR/yMy5 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQFC/bYmqRfpzJluFF4RAgJ1AKCTnsgQex1VMQF6WE3nugo3haxZ3gCePjpT M9xYMF1tvMnl+8+bczkhuf4= =Yxlp -----END PGP SIGNATURE----- --CUfgB8w4ZwR/yMy5--