Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
xen
xen-config.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File xen-config.diff of Package xen
--- a/Config.mk +++ b/Config.mk @@ -178,7 +178,7 @@ endif # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git -CONFIG_QEMU ?= $(QEMU_REMOTE) +CONFIG_QEMU ?= ioemu-qemu-xen QEMU_TAG := xen-4.1.2 #QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599 @@ -188,7 +188,7 @@ QEMU_TAG := xen-4.1.2 # Optional components XENSTAT_XENTOP ?= y VTPM_TOOLS ?= n -LIBXENAPI_BINDINGS ?= n +LIBXENAPI_BINDINGS ?= y PYTHON_TOOLS ?= y OCAML_TOOLS ?= y CONFIG_MINITERM ?= n --- a/tools/Makefile +++ b/tools/Makefile @@ -79,14 +79,16 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TAR --interp-prefix=$(CROSS_SYS_ROOT) endif -QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi) -ifneq ($(QEMU_ROOT),.) -export QEMU_ROOT -endif +#QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo ""; else echo .; fi) +#ifneq ($(QEMU_ROOT),.) +#export QEMU_ROOT +#endif ioemu-dir-find: set -ex; \ if test -d $(CONFIG_QEMU); then \ + rm -f ioemu-dir; \ + ln -sf $(CONFIG_QEMU) ioemu-dir; \ mkdir -p ioemu-dir; \ else \ if [ ! -d ioemu-remote ]; then \ @@ -107,7 +109,7 @@ ioemu-dir-find: set -e; \ $(buildmakevars2shellvars); \ cd ioemu-dir; \ - $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS) + ./xen-setup $(IOEMU_CONFIGURE_CROSS) .PHONY: ioemu-dir-force-update ioemu-dir-force-update: --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -195,7 +195,7 @@ xc_dom_bzimageloader.opic: CFLAGS += $(c libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l) libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l) xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -lxenctrl --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -35,11 +35,13 @@ eb-roms.h: Config mv -f $@.new $@ $T: - if ! wget -O _$T $(IPXE_TARBALL_URL); then \ - $(GIT) clone $(IPXE_GIT_URL) $D.git; \ - (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ - $(IPXE_GIT_TAG) | gzip >../_$T); \ - rm -rf $D.git; \ + if test -f /usr/bin/wget; then \ + if ! wget -O _$T $(IPXE_TARBALL_URL); then \ + $(GIT) clone $(IPXE_GIT_URL) $D.git; \ + (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ + $(IPXE_GIT_TAG) | gzip >../_$T); \ + rm -rf $D.git; \ + fi \ fi mv _$T $T
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor