* [PATCH] um: Fix out-of-tree build
@ 2015-06-28 21:00 Richard Weinberger
2015-07-01 17:35 ` Randy Dunlap
0 siblings, 1 reply; 2+ messages in thread
From: Richard Weinberger @ 2015-06-28 21:00 UTC (permalink / raw)
To: richard; +Cc: user-mode-linux-devel, linux-kernel
Commit 30b11ee9a (um: Remove copy&paste code from init.h)
uncovered an issue wrt. out-of-tree builds.
For out-of-tree builds, we must not rely on relative paths.
Before 30b11ee9a it worked by chance as no host code included
generated header files.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/um/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 098ab33..e3abe6f 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -70,8 +70,8 @@ KBUILD_AFLAGS += $(ARCH_INCLUDE)
USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \
$(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \
- -D_FILE_OFFSET_BITS=64 -idirafter include \
- -D__KERNEL__ -D__UM_HOST__
+ -D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \
+ -idirafter $(obj)/include -D__KERNEL__ -D__UM_HOST__
#This will adjust *FLAGS accordingly to the platform.
include $(ARCH_DIR)/Makefile-os-$(OS)
--
1.8.4.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] um: Fix out-of-tree build
2015-06-28 21:00 [PATCH] um: Fix out-of-tree build Richard Weinberger
@ 2015-07-01 17:35 ` Randy Dunlap
0 siblings, 0 replies; 2+ messages in thread
From: Randy Dunlap @ 2015-07-01 17:35 UTC (permalink / raw)
To: Richard Weinberger; +Cc: user-mode-linux-devel, linux-kernel
On 06/28/15 14:00, Richard Weinberger wrote:
> Commit 30b11ee9a (um: Remove copy&paste code from init.h)
> uncovered an issue wrt. out-of-tree builds.
> For out-of-tree builds, we must not rely on relative paths.
> Before 30b11ee9a it worked by chance as no host code included
> generated header files.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Works for me. Please merge so that linux-next builds stop failing.
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Thanks.
> ---
> arch/um/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/um/Makefile b/arch/um/Makefile
> index 098ab33..e3abe6f 100644
> --- a/arch/um/Makefile
> +++ b/arch/um/Makefile
> @@ -70,8 +70,8 @@ KBUILD_AFLAGS += $(ARCH_INCLUDE)
>
> USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \
> $(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \
> - -D_FILE_OFFSET_BITS=64 -idirafter include \
> - -D__KERNEL__ -D__UM_HOST__
> + -D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \
> + -idirafter $(obj)/include -D__KERNEL__ -D__UM_HOST__
>
> #This will adjust *FLAGS accordingly to the platform.
> include $(ARCH_DIR)/Makefile-os-$(OS)
>
--
~Randy
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-01 17:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-28 21:00 [PATCH] um: Fix out-of-tree build Richard Weinberger
2015-07-01 17:35 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox