From owner-freebsd-current@FreeBSD.ORG Sat Aug 13 08:54:18 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 67A8516A41F for ; Sat, 13 Aug 2005 08:54:18 +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 C671A43D45 for ; Sat, 13 Aug 2005 08:54:17 +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 j7D8sFDJ044916; Sat, 13 Aug 2005 11:54:15 +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 46710-04; Sat, 13 Aug 2005 11:54:10 +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 j7D8sAXj044913 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 13 Aug 2005 11:54:10 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.3/8.13.3) id j7D8sBqg049687; Sat, 13 Aug 2005 11:54:11 +0300 (EEST) (envelope-from ru) Date: Sat, 13 Aug 2005 11:54:11 +0300 From: Ruslan Ermilov To: Jeremie Le Hen Message-ID: <20050813085411.GA89765@ip.net.ua> References: <20050812223307.GE45385@obiwan.tataz.chchile.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tThc/1wpZn/ma/RB" Content-Disposition: inline In-Reply-To: <20050812223307.GE45385@obiwan.tataz.chchile.org> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua Cc: freebsd-current@FreeBSD.org 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:54:18 -0000 --tThc/1wpZn/ma/RB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Sat, Aug 13, 2005 at 12:33:08AM +0200, Jeremie Le Hen wrote: > 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 I don't remember exactly how etcmerge works, but if it calls "make distribution" from src/etc/, it's in trouble, please go on reading... > Can this issue be resolved in a way or another ? I'm not sure using > ${.OBJDIR}'s cap_mkdb(8) is an option. >=20 You should be running "make distribution" from under top of the src/ tree, not src/etc/. This takes care of properly setting the runtime environment up so that a bootstrapped version of cap_mkdb(8) is used, besides many other useful things. We bootstrap cap_mkdb(8) if (this was copied from Makefile.inc1): =2Eif ${BOOTSTRAPPING} < 600015 _cap_mkdb=3D usr.bin/cap_mkdb =2Eendif It may also be that for some reason your /usr/include/osreldate.h is lying about the currently installed version. To make the long story short... You can check all of this easily; assuming your sources are in the kosher location /usr/src, the bootstrapped version of cap_mkdb(8) capable of running on your host should be sitting ready in: /usr/obj/usr/src/tmp/legacy/usr/bin/cap_mkdb (Extrapolate this appropriately to your environment.) Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --tThc/1wpZn/ma/RB Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQFC/bUzqRfpzJluFF4RAht4AJ4zDtD0Nbf8NjN3yrYfDjUvzkMm+gCffwga XIUUD7MOpEyUzgw+tdAMar8= =vEq7 -----END PGP SIGNATURE----- --tThc/1wpZn/ma/RB--