Date: Thu, 9 Mar 2006 10:15:44 +0200 From: Ruslan Ermilov <ru@freebsd.org> To: Giorgos Keramidas <keramida@ceid.upatras.gr> Cc: deischen@freebsd.org, des@des.no, Hartmut Brandt <harti@freebsd.org>, current@freebsd.org, "M. Warner Losh" <imp@bsdimp.com> Subject: Re: When will bsnmp stop breaking -current builds Message-ID: <20060309081544.GD54826@ip.net.ua> In-Reply-To: <20060308200214.GA63755@flame.pc> References: <20060308085714.L10582@beagle.kn.op.dlr.de> <86bqwh59gn.fsf@xps.des.no> <20060308152413.GA43764@flame.pc> <20060308.115539.98861830.imp@bsdimp.com> <20060308192657.GA54826@ip.net.ua> <20060308200214.GA63755@flame.pc>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Wed, Mar 08, 2006 at 10:02:14PM +0200, Giorgos Keramidas wrote:
[...]
> > Please make it a ${_gensnmptree} and define it only for vulnerable
> > versions. If __FreeBSD_version wasn't bumped after it's been fixed,
> > put the next __FreeBSD_version value so that it stops rebuilding it
> > when the version gets bumped.
>
[...]
> This import of bsnmpd falls somewhere between these commits to param.h:
>
> ----------------------------
> revision 1.263
> date: 2006/02/17 14:14:15; author: andre; state: Exp; lines: +1 -1
> Replace the 4k fixed sized jumbo mbuf clusters with PAGE_SIZE sized
> jumbo mbuf clusters. To make the variable size clear they are named
> MJUMPAGESIZE.
>
> Having jumbo clusters with the native PAGE_SIZE is more useful than
> a fixed 4k size according the device driver writers using this API.
>
> The 9k and 16k jumbo mbuf clusters remain unchanged.
>
> Requested by: glebius, gallatin
> Sponsored by: TCP/IP Optimization Fundraise 2005
> MFC after: 3 days
> ----------------------------
> revision 1.262
> date: 2006/01/26 18:23:16; author: cognet; state: Exp; lines: +1 -1
> Version bump for pts import.
> ----------------------------
> revision 1.261
> date: 2006/01/12 20:27:35; author: brooks; state: Exp; lines: +1 -1
> Belated __FreeBSD_version bump for improvements to the Linux ldconfig
> support in etc/rc.d/abi.
> ----------------------------
>
> So I guess, if I understood what you said correctly Ruslan, the proper
> fix would be something like (700014 is the version after the 1.263 bump):
>
> %%%
> Index: Makefile.inc1
> ===================================================================
> --- Makefile.inc1 (.../branches/ncvs/src/Makefile.inc1) (revision 42)
> +++ Makefile.inc1 (.../trunk/src/Makefile.inc1) (revision 42)
> @@ -824,6 +824,10 @@
> _pwd_mkdb= usr.sbin/pwd_mkdb
> .endif
>
> +.if ${BOOTSTRAPPING} < 700014
> +_gensnmptree= usr.sbin/bsnmpd/gensnmptree
> +.endif
> +
> bootstrap-tools:
> .for _tool in \
> ${_strfile} \
> @@ -839,6 +843,7 @@
> usr.bin/rpcgen \
> usr.bin/xinstall \
> usr.sbin/config \
> + ${_gensnmptree} \
> ${_crunchgen} \
> ${_pwd_mkdb}
> ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
> %%%
>
Yes, exactly this.
Cheers,
--
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQFED+QwqRfpzJluFF4RAvHIAKCGt0wPQcFQyW7GWj7eLRbz1hBYrwCgmKUL
IZAubkUVQonNRo8bvBHMW9o=
=/9gA
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060309081544.GD54826>