[Xen-ia64-devel] [PATCH] Remove drivers/xen/Makefile from xen-mkbuildtree-pre

[Aron Griffis <aron@xxxxxx>]

Hopefully the first of a few patches to get rid of
xen-mkbuildtree-pre.  This isn't as elegant as it hopefully will be
eventually, but it gets the job done.

Tested by building on ia64

Signed-off-by: Aron Griffis <aron@xxxxxx>

# HG changeset patch
# User agriffis@xxxxxxxxxxxxxxxxx
# Node ID 744fe370d4f39caed84d53339d7dae36c314e6c8
# Parent  35f2341bfac8bb74ad2ca7e7f71f6c0663bb3e36
Merge arch/ia64/xen/drivers/Makefile to drivers/xen/Makefile
and remove it from xen-mkbuildtree-pre

diff -r 35f2341bfac8 -r 744fe370d4f3 
linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre        Wed May 24 
09:59:04 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre        Wed May 24 
15:06:03 2006 -0400
@@ -13,7 +13,6 @@ ln -sf ../../../../xen/include/asm-ia64/
 #ia64 drivers/xen isn't fully functional yet, workaround...
 #also ignore core/evtchn.c which uses a different irq mechanism than ia64
 #(warning: there be dragons here if these files diverge)
-ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile
 ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile
 
 #not sure where these ia64-specific files will end up in the future
diff -r 35f2341bfac8 -r 744fe370d4f3 linux-2.6-xen-sparse/drivers/xen/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/Makefile Wed May 24 09:59:04 2006 -0600
+++ b/linux-2.6-xen-sparse/drivers/xen/Makefile Wed May 24 15:06:03 2006 -0400
@@ -1,12 +1,19 @@
-
+ifeq ($(ARCH),ia64)
+ifneq ($(CONFIG_XEN_IA64_DOM0_VP),y)
+obj-y  += util.o
+endif
+obj-$(CONFIG_XEN_IA64_DOM0_VP) += net_driver_util.o
+obj-$(CONFIG_XEN_IA64_DOM0_VP) += balloon/
+else
 obj-y  += net_driver_util.o
 obj-y  += util.o
+obj-y  += balloon/
+obj-y  += char/
+endif
 
 obj-y  += core/
-obj-y  += char/
 obj-y  += console/
 obj-y  += evtchn/
-obj-y  += balloon/
 obj-y  += privcmd/
 obj-y  += xenbus/
 
diff -r 35f2341bfac8 -r 744fe370d4f3 
linux-2.6-xen-sparse/arch/ia64/xen/drivers/Makefile
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/Makefile       Wed May 24 
09:59:04 2006 -0600
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-
-ifneq ($(CONFIG_XEN_IA64_DOM0_VP),y)
-obj-y   += util.o
-endif
-obj-$(CONFIG_XEN_IA64_DOM0_VP) += net_driver_util.o
-
-obj-y  += core/
-#obj-y += char/
-obj-y  += console/
-obj-y  += evtchn/
-obj-$(CONFIG_XEN_IA64_DOM0_VP) += balloon/
-obj-y  += privcmd/
-obj-y  += xenbus/
-
-obj-$(CONFIG_XEN_BLKDEV_BACKEND)       += blkback/
-obj-$(CONFIG_XEN_NETDEV_BACKEND)       += netback/
-obj-$(CONFIG_XEN_TPMDEV_BACKEND)       += tpmback/
-obj-$(CONFIG_XEN_BLKDEV_FRONTEND)      += blkfront/
-obj-$(CONFIG_XEN_NETDEV_FRONTEND)      += netfront/
-obj-$(CONFIG_XEN_BLKDEV_TAP)           += blktap/
-obj-$(CONFIG_XEN_TPMDEV_FRONTEND)      += tpmfront/
-obj-$(CONFIG_XEN_PCIDEV_BACKEND)       += pciback/
-obj-$(CONFIG_XEN_PCIDEV_FRONTEND)      += pcifront/
Killed by signal 1.

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel