From owner-freebsd-current@FreeBSD.ORG Fri Aug 12 23:42:28 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 0614C16A41F for ; Fri, 12 Aug 2005 23:42:28 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id A895C43D45 for ; Fri, 12 Aug 2005 23:42:27 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j7CNgRB5022828; Fri, 12 Aug 2005 16:42:27 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j7CNgRVb022827; Fri, 12 Aug 2005 16:42:27 -0700 Date: Fri, 12 Aug 2005 16:42:27 -0700 From: Brooks Davis To: Jeremie Le Hen Message-ID: <20050812234227.GB22225@odin.ac.hmc.edu> References: <20050812223307.GE45385@obiwan.tataz.chchile.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3uo+9/B/ebqu+fSQ" Content-Disposition: inline In-Reply-To: <20050812223307.GE45385@obiwan.tataz.chchile.org> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu 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: Fri, 12 Aug 2005 23:42:28 -0000 --3uo+9/B/ebqu+fSQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. 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. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --3uo+9/B/ebqu+fSQ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFC/TPiXY6L6fI4GtQRAgsGAKDAoHrtcww3wI1pa7JqcKcePZzYlwCeNMFf pYro1CIveaMFGeE3T4jf7b0= =nGgn -----END PGP SIGNATURE----- --3uo+9/B/ebqu+fSQ--