Date: Sat, 1 Mar 2014 11:06:48 -0500 From: Mark Johnston <markj@freebsd.org> To: src-committers@freebsd.org Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, lwhsu@freebsd.org Subject: Re: svn commit: r262542 - in head: cddl/lib/libdtrace sys/cddl/contrib/opensolaris/uts/intel/dtrace sys/cddl/dev/dtrace/amd64 sys/cddl/dev/dtrace/i386 sys/cddl/dev/dtrace/x86 sys/modules/dtrace/dtrace Message-ID: <20140301160648.GB97155@raichu> In-Reply-To: <201402270104.s1R14ZCB007699@svn.freebsd.org> References: <201402270104.s1R14ZCB007699@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Feb 27, 2014 at 01:04:35AM +0000, Mark Johnston wrote: > Author: markj > Date: Thu Feb 27 01:04:35 2014 > New Revision: 262542 > URL: http://svnweb.freebsd.org/changeset/base/262542 > > Log: > Move some files that are identical on i386 and amd64 to an x86 subdirectory > rather than keeping duplicate copies. > > Discussed with: avg > MFC after: 1 week > > Added: > head/sys/cddl/dev/dtrace/x86/ > head/sys/cddl/dev/dtrace/x86/dis_tables.c > - copied unchanged from r262521, head/sys/cddl/dev/dtrace/amd64/dis_tables.c > head/sys/cddl/dev/dtrace/x86/dis_tables.h > - copied unchanged from r262521, head/sys/cddl/dev/dtrace/amd64/dis_tables.h > head/sys/cddl/dev/dtrace/x86/regset.h > - copied unchanged from r262521, head/sys/cddl/dev/dtrace/amd64/regset.h > Deleted: > head/sys/cddl/dev/dtrace/amd64/dis_tables.c > head/sys/cddl/dev/dtrace/amd64/dis_tables.h > head/sys/cddl/dev/dtrace/amd64/regset.h > head/sys/cddl/dev/dtrace/i386/dis_tables.c > head/sys/cddl/dev/dtrace/i386/dis_tables.h > head/sys/cddl/dev/dtrace/i386/regset.h > Modified: > head/cddl/lib/libdtrace/Makefile > head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c > head/sys/modules/dtrace/dtrace/Makefile This appears to have broken the ability to build dtrace.ko from sys/modules/dtrace/dtrace since I've added a file named "x86" to make's search path. Then kmod.mk decides that it doesn't need to create a symlink to sys/x86/include in the object directory, which breaks the build. The patch here fixes the problem by using an explicit path to the symlink. Would anyone be able to review it? http://people.freebsd.org/~lwhsu/patch/kmod.mk.diff Thanks, -Mark
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140301160648.GB97155>