[Xen-changelog] Clean up DESTDIR handling. Default install is to root

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 8f8e42887f09da773da6c5293f0553b3b540e0fb
# Parent  6bbfd6a989746d4fb0bf1e82f353ff564a8d192e
Clean up DESTDIR handling. Default install is to root
directory (/). This is only overridden automatically
for the 'make dist' targets and their legacy aliases
(make {xen,tools,kernels,docs}).

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 6bbfd6a98974 -r 8f8e42887f09 Config.mk
--- a/Config.mk Wed Oct  5 13:40:35 2005
+++ b/Config.mk Wed Oct  5 14:05:38 2005
@@ -20,9 +20,7 @@
 OBJCOPY    = $(CROSS_COMPILE)objcopy
 OBJDUMP    = $(CROSS_COMPILE)objdump
 
-# Default is to install to local 'dist' directory.
-DISTDIR ?= $(XEN_ROOT)/dist
-DESTDIR ?= $(DISTDIR)/install
+DISTDIR     ?= $(XEN_ROOT)/dist
 
 INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755
diff -r 6bbfd6a98974 -r 8f8e42887f09 Makefile
--- a/Makefile  Wed Oct  5 13:40:35 2005
+++ b/Makefile  Wed Oct  5 14:05:38 2005
@@ -37,23 +37,33 @@
        $(MAKE) -C docs build
 
 # build and install everything into local dist directory
-dist: xen kernels tools docs
+dist: DESTDIR=$(DISTDIR)/install
+dist: dist-xen dist-kernels dist-tools dist-docs
        $(INSTALL_DIR) $(DISTDIR)/check
        $(INSTALL_DATA) ./COPYING $(DISTDIR)
        $(INSTALL_DATA) ./README $(DISTDIR)
        $(INSTALL_PROG) ./install.sh $(DISTDIR)
        $(INSTALL_PROG) tools/check/chk tools/check/check_* $(DISTDIR)/check
+dist-%: DESTDIR=$(DISTDIR)/install
+dist-%: install-%
+       @: # do nothing
 
-xen:
+# Legacy dist targets
+xen: dist-xen
+tools: dist-tools
+kernels: dist-kernels
+docs: dist-docs
+
+install-xen:
        $(MAKE) -C xen install
 
-tools:
+install-tools:
        $(MAKE) -C tools install
 
-kernels:
+install-kernels:
        for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
 
-docs:
+install-docs:
        sh ./docs/check_pkgs && $(MAKE) -C docs install || true
 
 dev-docs:
@@ -109,10 +119,6 @@
        tar -jxf iptables-1.2.11.tar.bz2
        $(MAKE) -C iptables-1.2.11 PREFIX= 
KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install
 
-install-%: DESTDIR=
-install-%: %
-       @: # do nothing
-
 help:
        @echo 'Installation targets:'
        @echo '  install          - build and install everything'
@@ -151,7 +157,6 @@
        @echo '                     with extreme care!)'
 
 # Use this target with extreme care!
-uninstall: DESTDIR=
 uninstall: D=$(DESTDIR)
 uninstall:
        [ -d $(D)/etc/xen ] && mv -f $(D)/etc/xen $(D)/etc/xen.old-`date +%s` 
|| true
diff -r 6bbfd6a98974 -r 8f8e42887f09 buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk     Wed Oct  5 13:40:35 2005
+++ b/buildconfigs/Rules.mk     Wed Oct  5 14:05:38 2005
@@ -1,10 +1,5 @@
 
 include Config.mk
-
-# We expect these two to already be set if people 
-# are using the top-level Makefile
-DISTDIR        ?= $(CURDIR)/dist
-DESTDIR        ?= $(DISTDIR)/install
 
 export DESTDIR
 
diff -r 6bbfd6a98974 -r 8f8e42887f09 
linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c       Wed Oct  5 
13:40:35 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c       Wed Oct  5 
14:05:38 2005
@@ -94,7 +94,7 @@
 }
 
 EXPORT_SYMBOL(enable_hlt);
-
+#define xxprint(msg) HYPERVISOR_console_io(CONSOLEIO_write, strlen(msg), msg)
 /* XXX XEN doesn't use default_idle(), poll_idle(). Use xen_idle() instead. */
 extern void stop_hz_timer(void);
 extern void start_hz_timer(void);
@@ -121,9 +121,16 @@
 /* We don't actually take CPU down, just spin without interrupts. */
 static inline void play_dead(void)
 {
+    char foo[100];
+
+    sprintf(foo, "cpu=%d stack=%p\n", smp_processor_id(), foo);
+    xxprint(foo);
+
        /* Death loop */
        while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE)
                HYPERVISOR_sched_op(SCHEDOP_yield, 0);
+
+        xxprint("Out of loop\n");
 
        __flush_tlb_all();
    /* 
@@ -169,10 +176,15 @@
                        rmb();
 
                        if (cpu_is_offline(cpu)) {
+                            char foo[100];
                                local_irq_disable();
 #ifdef CONFIG_SMP
                                smp_suspend();
 #endif
+
+                                sprintf(foo, "X cpu=%d stack=%p\n",
+                                        cpu, &cpu);
+                                xxprint(foo);
 #if defined(CONFIG_XEN) && defined(CONFIG_HOTPLUG_CPU)
                                /* Ack it.  From this point on until
                                   we get woken up, we're not allowed
diff -r 6bbfd6a98974 -r 8f8e42887f09 xen/Makefile
--- a/xen/Makefile      Wed Oct  5 13:40:35 2005
+++ b/xen/Makefile      Wed Oct  5 14:05:38 2005
@@ -1,7 +1,3 @@
-# Default is to install to local 'dist' directory.
-DISTDIR ?= ../dist
-DESTDIR ?= $(DISTDIR)/install
-
 INSTALL                        = install
 INSTALL_DATA           = $(INSTALL) -m0644
 INSTALL_DIR            = $(INSTALL) -d -m0755

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