Date: Sat, 13 Aug 2005 11:58:14 +0300 From: Ruslan Ermilov <ru@freebsd.org> To: Brooks Davis <brooks@one-eyed-alien.net> Cc: freebsd-current@freebsd.org, Jeremie Le Hen <jeremie@le-hen.org> Subject: Re: make distribution and cap_mkdb -l from 5 to 6 Message-ID: <20050813085814.GB89765@ip.net.ua> In-Reply-To: <20050812234227.GB22225@odin.ac.hmc.edu> References: <20050812223307.GE45385@obiwan.tataz.chchile.org> <20050812234227.GB22225@odin.ac.hmc.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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,
> >
> > 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.
> >
> > 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'' :-).
> >
> > 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.
>
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,
--
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)
iD8DBQFC/bYmqRfpzJluFF4RAgJ1AKCTnsgQex1VMQF6WE3nugo3haxZ3gCePjpT
M9xYMF1tvMnl+8+bczkhuf4=
=Yxlp
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050813085814.GB89765>