* linux-next: build failure after merge of the final tree (xfs tree related)
@ 2011-08-15 6:10 Stephen Rothwell
2011-08-15 14:49 ` Christoph Hellwig
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-08-15 6:10 UTC (permalink / raw)
To: David Chinner, xfs-masters
Cc: linux-next, linux-kernel, Alex Elder, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
Hi all,
After merging the final tree, today's linux-next build (a powerpc server
config) failed like this:
In file included from fs/xfs/xfs_trace.h:1746,
from fs/xfs/xfs_trace.c:56:
include/trace/define_trace.h:89:43: error: ./xfs_trace.h: No such file or directory
Probably caused by commit c59d87c46076 ("xfs: remove subdirectories").
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: build failure after merge of the final tree (xfs tree related)
2011-08-15 6:10 linux-next: build failure after merge of the final tree (xfs tree related) Stephen Rothwell
@ 2011-08-15 14:49 ` Christoph Hellwig
2011-08-15 15:27 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2011-08-15 14:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Chinner, xfs-masters, linux-next, linux-kernel, Alex Elder,
Christoph Hellwig
On Mon, Aug 15, 2011 at 04:10:23PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (a powerpc server
> config) failed like this:
You'll need the patch below. Can you keep is as a fix-up for now until
Alex returns from his vacation?
---
From: Christoph Hellwig <hch@lst•de>
Subject: [PATCH] xfs: fix tracing builds inside the source tree
The code really requires the current source directory to be in the
header search path. We already do this if building with an object
tree separate from the source, but it needs to be added manually
if building inside the source. The cflags addition for it accidentally
got removed when collapsing the xfs directory structure.
Signed-off-by: Christoph Hellwig <hch@lst•de>
Index: xfs/fs/xfs/Makefile
===================================================================
--- xfs.orig/fs/xfs/Makefile 2011-08-13 06:41:29.586063467 -0700
+++ xfs/fs/xfs/Makefile 2011-08-13 06:41:58.245908204 -0700
@@ -16,6 +16,8 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+ccflags-y += -I$(src) # needed for trace events
+
ccflags-$(CONFIG_XFS_DEBUG) += -g
obj-$(CONFIG_XFS_FS) += xfs.o
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: build failure after merge of the final tree (xfs tree related)
2011-08-15 14:49 ` Christoph Hellwig
@ 2011-08-15 15:27 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-08-15 15:27 UTC (permalink / raw)
To: Christoph Hellwig
Cc: David Chinner, xfs-masters, linux-next, linux-kernel, Alex Elder
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
Hi Christoph,
On Mon, 15 Aug 2011 10:49:46 -0400 Christoph Hellwig <hch@infradead•org> wrote:
>
> On Mon, Aug 15, 2011 at 04:10:23PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the final tree, today's linux-next build (a powerpc server
> > config) failed like this:
>
> You'll need the patch below. Can you keep is as a fix-up for now until
> Alex returns from his vacation?
Thanks. I will add it starting tomorrow and remove it when it turns up
in the xfs tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-15 15:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-15 6:10 linux-next: build failure after merge of the final tree (xfs tree related) Stephen Rothwell
2011-08-15 14:49 ` Christoph Hellwig
2011-08-15 15:27 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox