SHA256
1
0
forked from pool/xen
OBS User unknown
2008-07-18 23:04:37 +00:00
committed by Git OBS Bridge
parent 8ae8ea2a74
commit f5d6338f4d
101 changed files with 2069 additions and 10556 deletions

View File

@@ -13,16 +13,15 @@ Signed-off-by: Gerd Hoffmann <kraxel@suse.de>
tools/Makefile | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
Index: xen-3.2-testing/config/x86_32.mk
Index: xen-3.3.0-testing/config/x86_32.mk
===================================================================
--- xen-3.2-testing.orig/config/x86_32.mk
+++ xen-3.2-testing/config/x86_32.mk
@@ -7,8 +7,10 @@ CONFIG_MIGRATE := y
--- xen-3.3.0-testing.orig/config/x86_32.mk
+++ xen-3.3.0-testing/config/x86_32.mk
@@ -7,7 +7,10 @@ CONFIG_MIGRATE := y
CONFIG_XCUTILS := y
CONFIG_IOEMU := y
-CFLAGS += -m32 -march=i686
-LIBDIR := lib
+CFLAGS += -m32 -march=i686
+LDFLAGS += -m32
+ASFLAGS += -m32
@@ -30,16 +29,16 @@ Index: xen-3.2-testing/config/x86_32.mk
# Use only if calling $(LD) directly.
LDFLAGS_DIRECT_OpenBSD = _obsd
Index: xen-3.2-testing/tools/Makefile
Index: xen-3.3.0-testing/tools/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/Makefile
+++ xen-3.2-testing/tools/Makefile
@@ -63,7 +63,7 @@ check_clean:
$(MAKE) -C check clean
--- xen-3.3.0-testing.orig/tools/Makefile
+++ xen-3.3.0-testing/tools/Makefile
@@ -23,7 +23,7 @@ SUBDIRS-y += blktap
SUBDIRS-y += libfsimage
SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
.PHONY: ioemu ioemuinstall ioemuclean
-ifeq ($(CONFIG_IOEMU),y)
-ifeq (ioemu,$(CONFIG_QEMU))
+ifeq ($(XEN_COMPILE_ARCH)$(CONFIG_IOEMU),$(XEN_TARGET_ARCH)y)
export IOEMU_DIR ?= ioemu
ioemu ioemuinstall:
[ -f $(IOEMU_DIR)/config-host.mak ] || \
SUBDIRS-$(CONFIG_IOEMU) += ioemu
else
SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir