compile: Add $TOP to get include of Makefiles work.

diff --git a/.gitignore b/.gitignore
index 0e89632a5e613ffc03696264d0a63d9cb3f860be..788acc250e0396561557578f1b42f8e248fe1199 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,14 @@ root_image/drivers/.tmp_versions/
 root_image/netperf
 root_image/tools/ssh_support/ssh-shadowgen
 root_image/pciutils
+root_image/tools/debug/fb_test
+root_image/tools/debug/fbtools
+root_image/tools/load_xen_modules/xen-detect
+root_image/tools/iostat-2.2/iostat
+Module.*
+*.ko.cmd
+*.o.cmd
+*.mod.c
+*.ko
+*.o
+modules.order

diff --git a/Makefile b/Makefile
index 7498dae064b8f1bfc82494dee22765f757080b2c..66df42c476f452c0dc61a620ad11aaf4cfd9b464 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ help:
        @echo ''
 COMPONENTS = root_image linux syslinux 
 
-
+TOP= .
 include sources.mk
 
 #####################################################################
@@ -106,7 +106,7 @@ $(LINUX_DST)/.config: linux.config
        mkdir -p $(LINUX_DST);
        ./linux_cfg.pl $(DEF_CONFIG) linux.config  >$@
        cp -f early-devs $(LINUX_DST)
-       yes | $(MAKE) -C $(LINUX_SRC) O=$(LINUX_DST) oldconfig
+       yes "" | $(MAKE) -C $(LINUX_SRC) O=$(LINUX_DST) oldconfig
 
 .PHONY:        linux-modules
 linux-modules: linux-config 

diff --git a/root_image/Makefile b/root_image/Makefile
index 779031f1acb0ac816b4717c9b4147cf2057d044d..f366001a6ad1fdedd8c8bfdf81a1ada235b6a07f 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -40,7 +40,9 @@ FC13 = 1
 FC12_RPM = 1
 endif
 
-LINUX_DST = ../linux-build
+TOP = ../
+include $(TOP)/sources.mk
+LINUX_DST = $(TOP)/linux-build
 LINUX_SRC = $(dir $(CURDIR))linux
 
 # Define the install commands that we'll need

diff --git a/sources.mk b/sources.mk
index 56be8b0eb165ed3cf82eecd8b4706fa34e3f2609..e3869be0466f0a7b1356ea763fdd19b40c61b807 100644 (file)
--- a/sources.mk
+++ b/sources.mk
@@ -2,7 +2,7 @@
 
 REPOS = syslinux root_image/busybox root_image/netperf root_image/pciutils root_image/RPMs xen linux
 
-include scm.mk
+include $(TOP)/scm.mk
 GIT_URL=git://xenbits.xensource.com/xentesttools/
 # Unroll those defines in real $-fetch labels..
 $(eval $(call GIT_REPO,syslinux.git,syslinux))