From owner-svn-src-stable@FreeBSD.ORG Mon Apr 19 10:16:36 2010 Return-Path: Delivered-To: svn-src-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CDF0106564A; Mon, 19 Apr 2010 10:16:36 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 4E5518FC08; Mon, 19 Apr 2010 10:16:36 +0000 (UTC) Received: from [10.0.0.3] (warner-iphone.bsdimp.com [10.0.0.3]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o3JA8n6T044606; Mon, 19 Apr 2010 04:08:49 -0600 (MDT) (envelope-from imp@bsdimp.com) From: Warner Losh To: Nikolay Denev In-Reply-To: <322ABBFE-C469-48FB-87FD-C00124238724@gmail.com> X-Mailer: iPhone Mail (7E18) References: <201004180115.o3I1FlLh027356@svn.freebsd.org> <322ABBFE-C469-48FB-87FD-C00124238724@gmail.com> Message-Id: <98983E26-D091-42C8-B920-8D4F917E5019@bsdimp.com> Content-Type: text/plain; charset=us-ascii; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (iPhone Mail 7E18) Date: Mon, 19 Apr 2010 04:08:46 -0600 Cc: "svn-src-stable@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "src-committers@FreeBSD.org" , Warner Losh , "svn-src-stable-8@FreeBSD.org" Subject: Re: svn commit: r206782 - stable/8/sys/conf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 10:16:36 -0000 Nikolay Did you do a buildworld after updating the sources before the buildkernel? Warner On Apr 19, 2010, at 12:28 AM, Nikolay Denev wrote: > On 18 Apr, 2010, at 04:15 , Warner Losh wrote: > >> Author: imp >> Date: Sun Apr 18 01:15:47 2010 >> New Revision: 206782 >> URL: http://svn.freebsd.org/changeset/base/206782 >> >> Log: >> Remap COMPAT_IA32 to COMPAT_FREEBSD32 to ease the transition of this >> option and not break 8.0 config files later in the 8.x branch. >> >> # Yes, this is a direct commit, since this is not relevant to head. >> >> Modified: >> stable/8/sys/conf/options.amd64 >> stable/8/sys/conf/options.ia64 >> >> Modified: stable/8/sys/conf/options.amd64 >> === >> === >> === >> ===================================================================== >> --- stable/8/sys/conf/options.amd64 Sun Apr 18 00:57:30 2010 >> (r206781) >> +++ stable/8/sys/conf/options.amd64 Sun Apr 18 01:15:47 2010 >> (r206782) >> @@ -11,6 +11,7 @@ MP_WATCHDOG >> # Options for emulators. These should only be used at config time, >> so >> # they are handled like options for static filesystems >> # (see src/sys/conf/options), except for broken debugging options. >> +COMPAT_IA32 = COMPAT_FREEBSD32 >> COMPAT_FREEBSD32 opt_compat.h >> #IBCS2 opt_dontuse.h >> #COMPAT_LINUX opt_dontuse.h >> >> Modified: stable/8/sys/conf/options.ia64 >> === >> === >> === >> ===================================================================== >> --- stable/8/sys/conf/options.ia64 Sun Apr 18 00:57:30 2010 >> (r206781) >> +++ stable/8/sys/conf/options.ia64 Sun Apr 18 01:15:47 2010 >> (r206782) >> @@ -9,6 +9,7 @@ LOG2_PAGE_SIZE opt_global.h >> >> UWX_TRACE_ENABLE opt_global.h >> >> +COMPAT_IA32 = COMPAT_FREEBSD32 >> COMPAT_FREEBSD32 opt_compat.h >> >> EXCEPTION_TRACING opt_xtrace.h >> > > > > Hi, > > After this change I can no longer compile a kernel : > > nas# make -j8 buildkernel WITH_CTF=1 > -------------------------------------------------------------- >>>> Kernel build for NAS started on Mon Apr 19 09:25:57 EEST 2010 > -------------------------------------------------------------- > ===> NAS > mkdir -p /usr/obj/usr/src/sys > -------------------------------------------------------------- >>>> stage 1: configuring the kernel > -------------------------------------------------------------- > cd /usr/src/sys/amd64/conf; PATH=/usr/obj/usr/src/tmp/legacy/usr/ > sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/ > usr/games:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/ > bin:/usr/obj/usr/src/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin > config -d /usr/obj/usr/src/sys/NAS /usr/src/sys/amd64/conf/NAS > ../../conf/options.amd64: Duplicate option COMPAT_FREEBSD32. > *** Error code 1 > 1 error > *** Error code 2 > 1 error > > When the change is reverted everything compiles ok. > > -- > Regards, > Nikolay Denev > > > > > > >