This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-changelog] Fix out of source tree build bugs:

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Fix out of source tree build bugs:
From: BitKeeper Bot <riel@xxxxxxxxxxx>
Date: Mon, 27 Jun 2005 12:59:45 +0000
Cc: james@xxxxxxxxxxxxx
Delivery-date: Mon, 27 Jun 2005 18:01:37 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxx>
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
ChangeSet 1.1758, 2005/06/27 13:59:45+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Fix out of source tree build bugs:
                - add (srctree)/include/asm-xen to include list
                - fix include2/asm link to reference asm-XENARCH
                - fix install target for public headeres
        This fix enables the complication of several configurations from the 
same (read-only) source tree.
        Signed-off-by: Shahar Frank <shaharf@xxxxxxxxxxxx>

 Makefile |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/Makefile 
--- a/linux-2.6.11-xen-sparse/arch/xen/Makefile 2005-06-27 14:02:44 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile 2005-06-27 14:02:44 -04:00
@@ -16,12 +16,22 @@
 # pick up headers from include/asm-xen/asm in preference over include/asm
 NOSTDINC_FLAGS  = -nostdinc -iwithprefix include/asm-xen -Iinclude/asm-xen 
-iwithprefix include
+ifneq ($(KBUILD_SRC),)
+NOSTDINC_FLAGS += -I$(srctree)/include/asm-xen
 # make uname return the processor arch
 core-y += arch/xen/kernel/
+.PHONY: include2/asm
+ifneq ($(KBUILD_SRC),)
+       @echo '  SYMLINK ../include/asm-$(XENARCH) -> include2/asm'
+       $(Q)ln -fsn ../include/asm-$(XENARCH) include2/asm
 include/.asm-ignore: include/asm
        @rm -f include/.asm-ignore
        @mv include/asm include/.asm-ignore
@@ -46,7 +56,7 @@
        $(call filechk,gen-asm-offsets)
 prepare: include/.asm-ignore include/asm-xen/asm \
-       arch/xen/arch include/asm-$(ARCH)/asm_offsets.h ;
+       arch/xen/arch include/asm-$(ARCH)/asm_offsets.h include2/asm ;
 all: vmlinuz
@@ -64,7 +74,7 @@
        install -m0664 System.map 
        ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) 
        mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
-       install -m0644 include/asm-xen/linux-public/*.h 
+       install -m0644 $(srctree)/include/asm-xen/linux-public/*.h 
        @if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi;

Xen-changelog mailing list

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Fix out of source tree build bugs:, BitKeeper Bot <=