summaryrefslogtreecommitdiff
path: root/sysutils/xentools30/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/xentools30/patches/patch-aa')
-rw-r--r--sysutils/xentools30/patches/patch-aa85
1 files changed, 52 insertions, 33 deletions
diff --git a/sysutils/xentools30/patches/patch-aa b/sysutils/xentools30/patches/patch-aa
index 23a901a32ee..5c185790fb6 100644
--- a/sysutils/xentools30/patches/patch-aa
+++ b/sysutils/xentools30/patches/patch-aa
@@ -1,45 +1,64 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/02 16:49:31 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2006/10/19 22:57:13 bouyer Exp $
---- Makefile.orig 2006-01-31 17:09:20.000000000 +0100
-+++ Makefile
-@@ -5,23 +5,18 @@ SUBDIRS :=
- SUBDIRS += libxc
- SUBDIRS += xenstore
- SUBDIRS += misc
--SUBDIRS += examples
--SUBDIRS += xentrace
- SUBDIRS += xcutils
- SUBDIRS += firmware
- SUBDIRS += security
- SUBDIRS += console
--SUBDIRS += xenmon
--SUBDIRS += guest-headers
- ifeq ($(VTPM_TOOLS),y)
- SUBDIRS += vtpm_manager
- SUBDIRS += vtpm
- endif
- SUBDIRS += xenstat
+--- Makefile.orig 2006-10-04 04:27:58.000000000 +0200
++++ Makefile 2006-10-17 00:20:51.000000000 +0200
+@@ -5,24 +5,16 @@
+ SUBDIRS-y += libxc
+ SUBDIRS-y += xenstore
+ SUBDIRS-y += misc
+-SUBDIRS-y += examples
+-SUBDIRS-y += xentrace
+ SUBDIRS-$(CONFIG_XCUTILS) += xcutils
+-SUBDIRS-$(CONFIG_X86) += firmware
+ SUBDIRS-y += security
+ SUBDIRS-y += console
+-SUBDIRS-y += xenmon
+-SUBDIRS-y += guest-headers
+ SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
+ SUBDIRS-$(VTPM_TOOLS) += vtpm
+ SUBDIRS-y += xenstat
+-SUBDIRS-y += libaio
+-SUBDIRS-y += blktap
+
# These don't cross-compile
ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
- SUBDIRS += python
--SUBDIRS += pygrub
+ SUBDIRS-y += python
+-SUBDIRS-y += pygrub
endif
- .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean
-@@ -45,15 +39,13 @@ clean: check_clean
- $(MAKE) ioemuclean
+ .PHONY: all
+@@ -30,34 +22,27 @@
+ @set -e; for subdir in $(SUBDIRS-y); do \
+ $(MAKE) -C $$subdir $@; \
+ done
+- $(MAKE) ioemu
+
+ .PHONY: install
+ install: check
+ @set -e; for subdir in $(SUBDIRS-y); do \
+ $(MAKE) -C $$subdir $@; \
+ done
+- $(MAKE) ioemuinstall
+- $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump
+- $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen
+
+ .PHONY: clean
+ clean: check_clean
+ @set -e; for subdir in $(SUBDIRS-y); do \
+ $(MAKE) -C $$subdir $@; \
+ done
+- $(MAKE) ioemuclean
+
+ .PHONY: distclean
+ distclean: clean
+ .PHONY: check
check:
- $(MAKE) -C check
+ .PHONY: check_clean
check_clean:
- $(MAKE) -C check clean
- ifndef XEN_NO_IOEMU
- ioemu ioemuinstall ioemuclean:
- [ -f ioemu/config-host.h ] || \
-- (cd ioemu; ./configure --prefix=usr)
-+ (cd ioemu; ./configure --prefix=$(PREFIX))
- $(MAKE) -C ioemu $(patsubst ioemu%,%,$@)
- else
- ioemu ioemuinstall ioemuclean:
+ .PHONY: ioemu ioemuinstall ioemuclean
+ ifdef CONFIG_IOEMU