From owner-svn-src-stable@FreeBSD.ORG Mon Apr 19 06:51:59 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 B4611106564A; Mon, 19 Apr 2010 06:51:59 +0000 (UTC) (envelope-from ndenev@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.158]) by mx1.freebsd.org (Postfix) with ESMTP id CEE4C8FC2F; Mon, 19 Apr 2010 06:51:58 +0000 (UTC) Received: by fg-out-1718.google.com with SMTP id e12so1669923fga.13 for ; Sun, 18 Apr 2010 23:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:mime-version :content-type:from:in-reply-to:date:cc:content-transfer-encoding :message-id:references:to:x-mailer; bh=JzofWUnxh9MP28ymFg3J5SAvAQqqk0T4/xXbFQ2EA28=; b=JGnvGgzjABSNEnth/fWbFMGkQa5X0Klcn8Uz/B31p70xS5f6KwRi54VG1Aq0o97s38 4mBHcye7hWZjlmf0MB/eedn0MlnSOk3EwHUmFEVIyRZgcEmjzsnmIyl5at9jdq7q4v8F uTXIRjbvCiKHFMfCUTGAu8Ag7P3i37oqERnMs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer; b=W+CMPNoR3n/+vVREhj+Drrl2W3qC8rc91PJNJpcjVuM9JESa7Jk9xAeqfa0NcTqPtX G2Nib4ph3usM7z4U27aL+9zYbD9IUQl1vQ7A09Bb2Nof7Lgeczg6tiWcIhlnnEy+xV1J DswVw8NTJIEGgB6HOzIJ7zJYs3aw+tKbnnfTc= Received: by 10.223.63.138 with SMTP id b10mr2382043fai.95.1271658510497; Sun, 18 Apr 2010 23:28:30 -0700 (PDT) Received: from mbp-gige.totalterror.net (93-152-151-19.ddns.onlinedirect.bg [93.152.151.19]) by mx.google.com with ESMTPS id 21sm9721623fks.23.2010.04.18.23.28.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 18 Apr 2010 23:28:29 -0700 (PDT) Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: text/plain; charset=us-ascii From: Nikolay Denev In-Reply-To: <201004180115.o3I1FlLh027356@svn.freebsd.org> Date: Mon, 19 Apr 2010 09:28:27 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: <322ABBFE-C469-48FB-87FD-C00124238724@gmail.com> References: <201004180115.o3I1FlLh027356@svn.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.1078) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, 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 06:51:59 -0000 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 >=20 > 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. >=20 > # Yes, this is a direct commit, since this is not relevant to head. >=20 > Modified: > stable/8/sys/conf/options.amd64 > stable/8/sys/conf/options.ia64 >=20 > Modified: stable/8/sys/conf/options.amd64 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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 =3D COMPAT_FREEBSD32 > COMPAT_FREEBSD32 opt_compat.h > #IBCS2 opt_dontuse.h > #COMPAT_LINUX opt_dontuse.h >=20 > Modified: stable/8/sys/conf/options.ia64 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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 >=20 > UWX_TRACE_ENABLE opt_global.h >=20 > +COMPAT_IA32 =3D COMPAT_FREEBSD32 > COMPAT_FREEBSD32 opt_compat.h >=20 > EXCEPTION_TRACING opt_xtrace.h >=20 Hi, After this change I can no longer compile a kernel : nas# make -j8 buildkernel WITH_CTF=3D1 -------------------------------------------------------------- >>> Kernel build for NAS started on Mon Apr 19 09:25:57 EEST 2010 -------------------------------------------------------------- =3D=3D=3D> NAS mkdir -p /usr/obj/usr/src/sys -------------------------------------------------------------- >>> stage 1: configuring the kernel -------------------------------------------------------------- cd /usr/src/sys/amd64/conf; = PATH=3D/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/us= r/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:/us= r/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