2004-11-18 17:50:34

by Blaisorblade

[permalink] [raw]
Subject: [patch 1/1] uml: partial KBUILD_OUTPUT fix


Start fixing KBUILD_OUTPUT support for UML. These changes are trivial and
no-ops when this feature is not enabled - the "hard part" of this support is
under discussion because it's hard to do properly (UML uses both shipped and
build-generated headers from a lot of different directories, and for good
reasons).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---

linux-2.6.10-rc-paolo/arch/um/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff -puN arch/um/Makefile~uml-KBUILD_OUTPUT-fix arch/um/Makefile
--- linux-2.6.10-rc/arch/um/Makefile~uml-KBUILD_OUTPUT-fix 2004-11-18 18:18:20.916697608 +0100
+++ linux-2.6.10-rc-paolo/arch/um/Makefile 2004-11-18 18:18:20.918697304 +0100
@@ -29,14 +29,14 @@ MAKEFILE-$(CONFIG_MODE_TT) += Makefile-t
MAKEFILE-$(CONFIG_MODE_SKAS) += Makefile-skas

ifneq ($(MAKEFILE-y),)
- include $(addprefix $(ARCH_DIR)/,$(MAKEFILE-y))
+ include $(addprefix $(srctree)/$(ARCH_DIR)/,$(MAKEFILE-y))
endif

ARCH_INCLUDE := -I$(ARCH_DIR)/include
SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH)

-include $(ARCH_DIR)/Makefile-$(SUBARCH)
-include $(ARCH_DIR)/Makefile-os-$(OS)
+include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
+include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)

# -Derrno=kernel_errno - This turns all kernel references to errno into
# kernel_errno to separate them from the libc errno. This allows -fno-common
_