svn commit: r206782 - stable/8/sys/conf

[Nikolay Denev]

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