From owner-svn-src-all@FreeBSD.ORG Tue Apr 16 16:19:21 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6306E83E for ; Tue, 16 Apr 2013 16:19:21 +0000 (UTC) (envelope-from jdc@koitsu.org) Received: from qmta01.emeryville.ca.mail.comcast.net (qmta01.emeryville.ca.mail.comcast.net [IPv6:2001:558:fe2d:43:76:96:30:16]) by mx1.freebsd.org (Postfix) with ESMTP id 48A396C3 for ; Tue, 16 Apr 2013 16:19:21 +0000 (UTC) Received: from omta01.emeryville.ca.mail.comcast.net ([76.96.30.11]) by qmta01.emeryville.ca.mail.comcast.net with comcast id QdAx1l0060EPchoA1gKMx4; Tue, 16 Apr 2013 16:19:21 +0000 Received: from koitsu.strangled.net ([67.180.84.87]) by omta01.emeryville.ca.mail.comcast.net with comcast id QgKL1l0041t3BNj8MgKLn4; Tue, 16 Apr 2013 16:19:20 +0000 Received: by icarus.home.lan (Postfix, from userid 1000) id DEA0073A33; Tue, 16 Apr 2013 09:19:19 -0700 (PDT) Date: Tue, 16 Apr 2013 09:19:19 -0700 From: Jeremy Chadwick To: Brooks Davis Subject: Re: svn commit: r249549 - in stable/9/sys: amd64/conf i386/conf Message-ID: <20130416161919.GA80626@icarus.home.lan> References: <201304161609.r3GG9SID009937@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201304161609.r3GG9SID009937@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1366129161; bh=c39IGxW/Xm4Z0cLTIsn5919wyGaCl2zOjqsrEgA6gU8=; h=Received:Received:Received:Date:From:To:Subject:Message-ID: MIME-Version:Content-Type; b=mUxJurbryp7jSOpvS+luny7X2ylKf84UfL2exGyQcAne+ey7MqnfPnlraljG5uKR3 fxPrV5BwdSDuVzon+ILTscrlxRpKNSrsJIbNSiMO28t34GoPnCHcypknPBjN3Zu9dR qJ3KLlfjHQmFAgUFfvUcVnEQPCdyfMrgfH5NXcIsyC73+mdakrbX1I1q4M+vZGXPFN 80bgMUMe/1FDJ+nnfLZKW/gTVe+lZurVFAMu13CGwFCE2MmG7Z5vghQFSC7rZjalAp O9PugFVoRmE9rPIimhBcaBCJkTJ5P2qMYajyMT31xNxiNtJkqq/tWhb9v2sNc3eG8y RwgtCjVCQ6wqw== Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2013 16:19:21 -0000 On Tue, Apr 16, 2013 at 04:09:28PM +0000, Brooks Davis wrote: > Author: brooks > Date: Tue Apr 16 16:09:27 2013 > New Revision: 249549 > URL: http://svnweb.freebsd.org/changeset/base/249549 > > Log: > MFC (much delayed) 234504: > > Enable DTrace hooks in GENERIC. > > Modified: > stable/9/sys/amd64/conf/GENERIC > stable/9/sys/i386/conf/GENERIC > Directory Properties: > stable/9/sys/ (props changed) > > Modified: stable/9/sys/amd64/conf/GENERIC > ============================================================================== > --- stable/9/sys/amd64/conf/GENERIC Tue Apr 16 14:22:16 2013 (r249548) > +++ stable/9/sys/amd64/conf/GENERIC Tue Apr 16 16:09:27 2013 (r249549) > @@ -22,6 +22,7 @@ cpu HAMMER > ident GENERIC > > makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols > +makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support > > options SCHED_ULE # ULE scheduler > options PREEMPTION # Enable kernel thread preemption > @@ -63,11 +64,12 @@ options KBD_INSTALL_CDEV # install a CD > options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) > options AUDIT # Security event auditing > options MAC # TrustedBSD MAC Framework > -#options KDTRACE_FRAME # Ensure frames are compiled in > -#options KDTRACE_HOOKS # Kernel DTrace hooks > +options KDTRACE_FRAME # Ensure frames are compiled in > +options KDTRACE_HOOKS # Kernel DTrace hooks > options INCLUDE_CONFIG_FILE # Include this file in kernel > options KDB # Kernel debugger related code > options KDB_TRACE # Print a stack trace for a panic > +options DDB_CTF # kernel ELF linker loads CTF data > > # Make an SMP-capable kernel by default > options SMP # Symmetric MultiProcessor Kernel > > Modified: stable/9/sys/i386/conf/GENERIC > ============================================================================== > --- stable/9/sys/i386/conf/GENERIC Tue Apr 16 14:22:16 2013 (r249548) > +++ stable/9/sys/i386/conf/GENERIC Tue Apr 16 16:09:27 2013 (r249549) > @@ -24,6 +24,7 @@ cpu I686_CPU > ident GENERIC > > makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols > +makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support > > options SCHED_ULE # ULE scheduler > options PREEMPTION # Enable kernel thread preemption > @@ -64,10 +65,11 @@ options KBD_INSTALL_CDEV # install a CD > options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) > options AUDIT # Security event auditing > options MAC # TrustedBSD MAC Framework > -#options KDTRACE_HOOKS # Kernel DTrace hooks > +options KDTRACE_HOOKS # Kernel DTrace hooks > options INCLUDE_CONFIG_FILE # Include this file in kernel > options KDB # Kernel debugger related code > options KDB_TRACE # Print a stack trace for a panic > +options DDB_CTF # kernel ELF linker loads CTF data > > # To make an SMP kernel, the next two lines are needed > options SMP # Symmetric MultiProcessor Kernel Now that this has been enabled by default, I should warn folks of a caveat that I found in the buildworld/buildkernel framework. It's easiest to explain like this: 1. Install FreeBSD 9.x, svn checkout of stable/9, etc... 2. Add WITHOUT_CDDL=true to /etc/src.conf 3. Rebuild + install kernel/world per src/Makefile procedure 4. Remove WITHOUT_CDDL=true from /etc/src.conf 5. rm -fr /usr/obj/* 6. Rebuild world 7. Rebuild kernel -- fails, stating "ctfconvert: not found". For whatever reason the buildkernel bits make the assumption that ctfconvert exists on the system (presumably in $PATH or possibly a hard-coded), when ideally it should try to use the recently-built version in /usr/obj first. -- | Jeremy Chadwick jdc@koitsu.org | | UNIX Systems Administrator http://jdc.koitsu.org/ | | Mountain View, CA, US | | Making life hard for others since 1977. PGP 4BD6C0CB |