Bastian Blank
2011-Mar-16 16:18 UTC
[Pkg-xen-changes] r831 - in trunk/xen/debian: . patches
Author: waldi Date: Wed Mar 16 16:18:07 2011 New Revision: 831 Log: * debian/changelog: Set version to 4.1.0~rc6-1. * debian/patches: Update patches. * debian/patches/tools-firmware-etherboot-packaged.diff: Use (not yet) packaged version of ipxe. * debian/patches/tools-disable.diff, debian/rules.real: Disable hvmloader for now. Added: trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff Deleted: trunk/xen/debian/patches/tools-misc-xend-startup.diff trunk/xen/debian/patches/upstream-21547:ca2738f258f8 trunk/xen/debian/patches/upstream-22765:0dbad563a659 Modified: trunk/xen/debian/changelog trunk/xen/debian/patches/config-prefix.diff trunk/xen/debian/patches/docs-pdflatex.patch trunk/xen/debian/patches/series trunk/xen/debian/patches/tools-blktap2-link.diff trunk/xen/debian/patches/tools-blktap2-optimize.diff trunk/xen/debian/patches/tools-blktap2-prefix.diff trunk/xen/debian/patches/tools-console-prefix.diff trunk/xen/debian/patches/tools-disable.diff trunk/xen/debian/patches/tools-flask-abiname.diff trunk/xen/debian/patches/tools-libfsimage-abiname.diff trunk/xen/debian/patches/tools-libfsimage-rpath.diff trunk/xen/debian/patches/tools-libxc-abiname.diff trunk/xen/debian/patches/tools-libxc-prefix.diff trunk/xen/debian/patches/tools-libxl-abiname.diff trunk/xen/debian/patches/tools-libxl-link.diff trunk/xen/debian/patches/tools-libxl-prefix.diff trunk/xen/debian/patches/tools-misc-prefix.diff trunk/xen/debian/patches/tools-misc-rpath.diff trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch trunk/xen/debian/patches/tools-python-rpath.diff trunk/xen/debian/patches/tools-python-xen-relative-path.diff trunk/xen/debian/patches/tools-xcutils-rpath.diff trunk/xen/debian/patches/tools-xenmon-rpath.diff trunk/xen/debian/patches/tools-xenpaging-prefix.diff trunk/xen/debian/patches/tools-xenstore-prefix.diff trunk/xen/debian/patches/tools-xenstore-rpath.diff trunk/xen/debian/patches/tools-xentrace-prefix.diff trunk/xen/debian/patches/tools-xentrace-rpath.diff trunk/xen/debian/patches/version.patch trunk/xen/debian/rules.real Modified: trunk/xen/debian/changelog =============================================================================--- trunk/xen/debian/changelog Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/changelog Wed Mar 16 16:18:07 2011 (r831) @@ -1,4 +1,4 @@ -xen (4.0.2~rc2-1) UNRELEASED; urgency=low +xen (4.1.0~rc6-1) UNRELEASED; urgency=low * New upstream release candidate. * Build documentation using pdflatex. @@ -10,6 +10,7 @@ - Fix includes. - Fix linking of blktap2 binaries. - Remove optimization setting. + * Temporarily disable hvmloader, wants to download ipxe. -- Bastian Blank <waldi at debian.org> Tue, 08 Mar 2011 13:21:34 +0100 Modified: trunk/xen/debian/patches/config-prefix.diff =============================================================================--- trunk/xen/debian/patches/config-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/config-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -6,7 +6,7 @@ INCLUDEDIR = $(PREFIX)/include -LIBLEAFDIR = lib -LIBLEAFDIR_x86_32 = lib --LIBLEAFDIR_x86_64 = lib64 +-LIBLEAFDIR_x86_64 ?= lib64 -LIBDIR = $(PREFIX)/$(LIBLEAFDIR) -LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32) -LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) @@ -24,8 +24,8 @@ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin +PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib + -+XENFIRMWAREDIR = $(PRIVATE_PREFIX)/boot +LIBEXEC = $(PRIVATE_LIBDIR) ++XENFIRMWAREDIR = $(PRIVATE_PREFIX)/boot ifeq ($(PREFIX),/usr) CONFIG_DIR = /etc @@ -45,7 +45,7 @@ LDFLAGS_DIRECT += -melf_x86_64_obsd --- a/Config.mk +++ b/Config.mk -@@ -33,14 +33,14 @@ +@@ -49,14 +49,14 @@ ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include Modified: trunk/xen/debian/patches/docs-pdflatex.patch =============================================================================--- trunk/xen/debian/patches/docs-pdflatex.patch Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/docs-pdflatex.patch Wed Mar 16 16:18:07 2011 (r831) @@ -194,4 +194,4 @@ +\newcommand{\coversheetlogo}{xen} %% Document date - \newcommand{\datestring}{20th November 2009} + \newcommand{\datestring}{10th January 2010} Modified: trunk/xen/debian/patches/series =============================================================================--- trunk/xen/debian/patches/series Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/series Wed Mar 16 16:18:07 2011 (r831) @@ -36,9 +36,9 @@ tools-xentrace-rpath.diff tools-python-xen-relative-path.diff -tools-misc-xend-startup.diff tools-disable.diff +tools-firmware-etherboot-packaged.diff tools-pygrub-remove-static-solaris-support.patch @@ -46,6 +46,3 @@ tools-xenmon-install.diff tools-python-shebang.diff - -upstream-21547:ca2738f258f8 -upstream-22765:0dbad563a659 Modified: trunk/xen/debian/patches/tools-blktap2-link.diff =============================================================================--- trunk/xen/debian/patches/tools-blktap2-link.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-blktap2-link.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,14 +1,14 @@ --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile -@@ -15,7 +15,6 @@ - CFLAGS += -I../lib -I../../libxc - CFLAGS += -I../include -I../../include +@@ -14,7 +14,6 @@ + CFLAGS += -fno-strict-aliasing + CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += -I $(LIBAIO_DIR) CFLAGS += -I $(MEMSHR_DIR) CFLAGS += -D_GNU_SOURCE CFLAGS += -DUSE_NFS_LOCKS -@@ -53,7 +52,6 @@ +@@ -40,7 +39,6 @@ $(REMUS-OBJS): CFLAGS += -I$(XEN_XENSTORE) @@ -16,7 +16,7 @@ MEMSHR_DIR = $(XEN_ROOT)/tools/memshr MEMSHRLIBS :-@@ -62,8 +60,8 @@ +@@ -49,8 +47,8 @@ MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a endif @@ -27,3 +27,13 @@ ifeq ($(VHD_STATIC),y) td-util: CFLAGS += -static +--- a/tools/Rules.mk ++++ b/tools/Rules.mk +@@ -35,6 +35,7 @@ + ifeq ($(LIBXL_BLKTAP),y) + CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_include) + LDLIBS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl ++LDRPATH_libblktapctl = -Wl,-rpath-link,$(XEN_BLKTAP2)/control + else + CFLAGS_libblktapctl + LDLIBS_libblktapctl Modified: trunk/xen/debian/patches/tools-blktap2-optimize.diff =============================================================================--- trunk/xen/debian/patches/tools-blktap2-optimize.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-blktap2-optimize.diff Wed Mar 16 16:18:07 2011 (r831) @@ -7,4 +7,4 @@ -CFLAGS += -Werror -g -O0 CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing - CFLAGS += -I../lib -I../../libxc + CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers Modified: trunk/xen/debian/patches/tools-blktap2-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-blktap2-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-blktap2-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,15 +1,3 @@ ---- a/tools/blktap2/Makefile -+++ b/tools/blktap2/Makefile -@@ -1,9 +1,6 @@ - XEN_ROOT = ../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += $(CFLAGS_libxenctrl) --LDFLAGS += $(LDFLAGS_libxenctrl) -- - SUBDIRS-y :- SUBDIRS-y += include - SUBDIRS-y += lvm --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -12,6 +12,7 @@ @@ -22,8 +10,14 @@ CFLAGS += -fPIC --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile -@@ -8,9 +8,7 @@ +@@ -2,15 +2,9 @@ + BLKTAP_ROOT := ../.. + include $(XEN_ROOT)/tools/Rules.mk +-LIBVHD-MAJOR = 1.0 +-LIBVHD-MINOR = 0 +-LIBVHD-SONAME = libvhd.so.$(LIBVHD-MAJOR) +- LVM-UTIL-OBJ := $(BLKTAP_ROOT)/lvm/lvm-util.o -LIBVHD-BUILD := libvhd.a @@ -33,7 +27,7 @@ CFLAGS += -Werror CFLAGS += -Wno-unused -@@ -18,10 +16,12 @@ +@@ -18,10 +12,12 @@ CFLAGS += -D_GNU_SOURCE CFLAGS += -fPIC CFLAGS += -g @@ -46,34 +40,91 @@ # Get gcc to generate the dependencies for us. CFLAGS += -Wp,-MD,.$(@F).d -@@ -48,24 +48,19 @@ +@@ -48,24 +44,22 @@ LIB-OBJS = $(patsubst %.c,%.o,$(LIB-SRCS)) LIB-OBJS += $(LVM-UTIL-OBJ) -LIBVHD = libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) -+LIBVHD = libvhd.so ++LIBVHD = libvhd.a libvhd.so all: build - build: $(LIBVHD-BUILD) +-build: $(LIBVHD-BUILD) ++build: $(LIBVHD) ++ ++libvhd.so: $(LIB-OBJS) ++ $(CC) $(CFLAGS) $(SHLIB_LDFLAGS) \ ++ $(LDFLAGS) -o $@ $(LIBS) $^ --libvhd.a: $(LIB-OBJS) -- $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_CFLAGS) \ + libvhd.a: $(LIB-OBJS) +- $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \ - $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(LIBS) $^ - ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR) - ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so -- $(AR) rc $@ $^ -+libvhd.so: $(LIB-OBJS) -+ $(CC) $(CFLAGS) $(SHLIB_CFLAGS) \ -+ $(LDFLAGS) -o $@ $(LIBS) $^ + $(AR) rc $@ $^ install: all -- $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR) -- $(INSTALL_DATA) $(LIBVHD) $(DESTDIR)$(INST-DIR) + $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR) + $(INSTALL_PROG) $(LIBVHD) $(DESTDIR)$(INST-DIR) - ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR) - ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so -+ $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_LIBDIR) -+ $(INSTALL_DATA) $(LIBVHD) $(DESTDIR)$(PRIVATE_LIBDIR) clean: rm -rf *.a *.so* *.o *~ $(DEPS) $(LIBVHD) +--- a/tools/blktap2/control/Makefile ++++ b/tools/blktap2/control/Makefile +@@ -1,10 +1,7 @@ + XEN_ROOT := ../../../ + include $(XEN_ROOT)/tools/Rules.mk + +-MAJOR = 1.0 +-MINOR = 0 + LIBNAME = libblktapctl +-LIBSONAME = $(LIBNAME).so.$(MAJOR) + + IBIN = tap-ctl + +@@ -41,35 +38,29 @@ + PICS = $(CTL_PICS) + + LIB_STATIC = $(LIBNAME).a +-LIB_SHARED = $(LIBSONAME).$(MINOR) ++LIB_SHARED = $(LIBNAME).so + IBIN = tap-ctl + + all: build + + build: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) + +-$(LIBNAME).so: $(LIBSONAME) +- ln -sf $< $@ +- +-$(LIBSONAME): $(LIB_SHARED) +- ln -sf $< $@ +- + tap-ctl: tap-ctl.o $(LIBNAME).so +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(call LDFLAGS_RPATH,../lib) -o $@ $^ + + $(LIB_STATIC): $(CTL_OBJS) + $(AR) r $@ $^ + + $(LIB_SHARED): $(CTL_PICS) +- $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ + + install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) +- $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR) +- $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR) ++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_SBINDIR) ++ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) ++ $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(PRIVATE_BINDIR) + $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR) +- $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR) +- ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so +- ln -sf $(LIB_SHARED) $(DESTDIR)$(LIBDIR)/$(LIBSONAME) ++ $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(PRIVATE_LIBDIR) + + clean: + rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED) Modified: trunk/xen/debian/patches/tools-console-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-console-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-console-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,14 +1,14 @@ --- a/tools/console/Makefile +++ b/tools/console/Makefile -@@ -8,6 +8,7 @@ - CFLAGS += $(CFLAGS_libxenstore) - LDFLAGS += $(LDFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenstore) +@@ -11,6 +11,7 @@ + LDLIBS += $(UTIL_LIBS) + LDLIBS += $(SOCKET_LIBS) + LDLIBS += -lrt +LDFLAGS += $(call LDFLAGS_RPATH,../lib) BIN = xenconsoled xenconsole -@@ -29,9 +30,7 @@ +@@ -30,9 +31,7 @@ .PHONY: install install: $(BIN) Modified: trunk/xen/debian/patches/tools-disable.diff =============================================================================--- trunk/xen/debian/patches/tools-disable.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-disable.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,6 +1,13 @@ --- a/tools/Makefile +++ b/tools/Makefile -@@ -20,9 +20,7 @@ +@@ -12,28 +12,19 @@ + SUBDIRS-y += hotplug + SUBDIRS-y += xentrace + SUBDIRS-$(CONFIG_XCUTILS) += xcutils +-SUBDIRS-$(CONFIG_X86) += firmware + SUBDIRS-$(ACM_SECURITY) += security + SUBDIRS-y += console + SUBDIRS-y += xenmon SUBDIRS-$(VTPM_TOOLS) += vtpm_manager SUBDIRS-$(VTPM_TOOLS) += vtpm SUBDIRS-y += xenstat @@ -10,11 +17,15 @@ SUBDIRS-$(CONFIG_Linux) += blktap2 SUBDIRS-$(CONFIG_NetBSD) += libaio SUBDIRS-$(CONFIG_NetBSD) += blktap2 -@@ -31,7 +29,6 @@ + SUBDIRS-$(CONFIG_NetBSD) += xenbackendd + SUBDIRS-y += libfsimage SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen - SUBDIRS-$(CONFIG_Linux) += fs-back - SUBDIRS-$(CONFIG_NetBSD) += fs-back +- +-# do not recurse in to a dir we are about to delete +-ifneq "$(MAKECMDGOALS)" "distclean" -SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir +-endif +- SUBDIRS-y += xenpmd SUBDIRS-y += libxl SUBDIRS-y += remus Added: trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff =============================================================================--- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff Wed Mar 16 16:18:07 2011 (r831) @@ -0,0 +1,56 @@ +--- a/tools/firmware/etherboot/Makefile ++++ b/tools/firmware/etherboot/Makefile +@@ -14,50 +14,19 @@ + + IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz + +-D=ipxe +-T=ipxe.tar.gz +- +-ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(NICS))) ++ROMS = $(addprefix /usr/lib/ipxe/, $(addsuffix .rom, $(NICS))) + + .NOTPARALLEL: + + .PHONY: all + all: eb-roms.h + +-%.rom: $D/src/arch/i386/Makefile +- $(MAKE) -C $D/src bin/$(*F).rom +- +-eb-roms.h.new: $(ROMS) ++eb-roms.h: $(ROMS) + cat $^ | ../hvmloader/mkhex etherboot >$@ + +-eb-roms.h: Config +- $(MAKE) NO_WERROR=1 $@.new +- 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; \ +- fi +- mv _$T $T +- +-$D/src/arch/i386/Makefile: $T Config +- rm -rf $D +- gzip -dc $T | tar xf - +- for i in $$(cat patches/series) ; do \ +- patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \ +- done +- cat Config >>$@ +- +-$D/src/bin/NIC: $D/src/arch/i386/Makefile +- $(MAKE) -C $D/src bin/NIC +- + .PHONY: clean + clean: +- rm -rf $D $D.git *~ eb-roms.h _$T ++ rm -rf *~ eb-roms.h + + .PHONY: distclean + distclean: clean +- rm -rf $T Modified: trunk/xen/debian/patches/tools-flask-abiname.diff =============================================================================--- trunk/xen/debian/patches/tools-flask-abiname.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-flask-abiname.diff Wed Mar 16 16:18:07 2011 (r831) @@ -38,8 +38,8 @@ - ln -sf $< $@ - -libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ +libflask.so: $(PIC_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -include $(DEPS) Modified: trunk/xen/debian/patches/tools-libfsimage-abiname.diff =============================================================================--- trunk/xen/debian/patches/tools-libfsimage-abiname.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-libfsimage-abiname.diff Wed Mar 16 16:18:07 2011 (r831) @@ -40,9 +40,9 @@ - ln -sf $< $@ - -libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ -lpthread +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ -lpthread +libfsimage.so: $(PIC_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lpthread ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lpthread -include $(DEPS) Modified: trunk/xen/debian/patches/tools-libfsimage-rpath.diff =============================================================================--- trunk/xen/debian/patches/tools-libfsimage-rpath.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-libfsimage-rpath.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,8 +1,8 @@ --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk -@@ -2,6 +2,7 @@ - - CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror +@@ -3,6 +3,7 @@ + CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ + CFLAGS += -Werror -D_GNU_SOURCE LDFLAGS += -L../common/ +LDFLAGS += $(call LDFLAGS_RPATH,../..) Modified: trunk/xen/debian/patches/tools-libxc-abiname.diff =============================================================================--- trunk/xen/debian/patches/tools-libxc-abiname.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-libxc-abiname.diff Wed Mar 16 16:18:07 2011 (r831) @@ -10,7 +10,7 @@ CTRL_SRCS-y : CTRL_SRCS-y += xc_core.c CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c -@@ -77,12 +74,12 @@ +@@ -90,12 +87,12 @@ LIB := libxenctrl.a ifneq ($(stubdom),y) @@ -24,8 +24,8 @@ +LIB += libxenguest.so endif - .PHONY: all -@@ -99,16 +96,12 @@ + ifneq ($(stubdom),y) +@@ -116,15 +113,11 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) @@ -34,8 +34,7 @@ $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) - ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) - ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so - $(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR) - + $(INSTALL_DATA) xenctrl.h xenctrlosdep.h xentoollog.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) + $(INSTALL_PROG) libxenguest.so $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) @@ -44,7 +43,7 @@ $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS -@@ -136,24 +129,14 @@ +@@ -153,24 +146,14 @@ libxenctrl.a: $(CTRL_LIB_OBJS) $(AR) rc $@ $^ @@ -54,9 +53,9 @@ - ln -sf $< $@ - -libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS) +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) +libxenctrl.so: $(CTRL_PIC_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) # libxenguest @@ -71,16 +70,16 @@ ifeq ($(CONFIG_MiniOS),y) zlib-options else -@@ -172,9 +155,9 @@ +@@ -193,9 +176,9 @@ xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D) xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) --libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l) +-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_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) -+libxenguest.so: LDFLAGS += $(call zlib-options,l) +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) ++libxenguest.so: COMPRESSION_LIBS = $(call zlib-options,l) +libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) - - -include $(DEPS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) + xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so + $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -lxenctrl Modified: trunk/xen/debian/patches/tools-libxc-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-libxc-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-libxc-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,6 +1,6 @@ --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile -@@ -94,13 +94,14 @@ +@@ -111,12 +111,13 @@ .PHONY: install install: build @@ -10,28 +10,27 @@ - $(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(LIBDIR) + $(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR) - + $(INSTALL_DATA) xenctrl.h xenctrlosdep.h xentoollog.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROG) libxenguest.so $(DESTDIR)$(LIBDIR) + $(INSTALL_PROG) libxenguest.so $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) -@@ -130,7 +131,7 @@ +@@ -147,7 +148,7 @@ $(AR) rc $@ $^ libxenctrl.so: $(CTRL_PIC_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS) +- $(CC) $(CFLAGS) $(LDFLAGS) $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS) # libxenguest -@@ -157,7 +158,7 @@ +@@ -178,7 +179,7 @@ - libxenguest.so: LDFLAGS += $(call zlib-options,l) + libxenguest.so: COMPRESSION_LIBS = $(call zlib-options,l) libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so -- $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) - - -include $(DEPS) +- $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) + xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so + $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -lxenctrl Modified: trunk/xen/debian/patches/tools-libxl-abiname.diff =============================================================================--- trunk/xen/debian/patches/tools-libxl-abiname.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-libxl-abiname.diff Wed Mar 16 16:18:07 2011 (r831) @@ -10,12 +10,12 @@ -XLUMAJOR = 1.0 -XLUMINOR = 0 - - CFLAGS += -Werror + CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations CFLAGS += -I. -fPIC - CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) -@@ -52,26 +46,14 @@ - - libxl_paths.c: _libxl_paths.h + CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) +@@ -74,26 +68,14 @@ + mv __libxl_$*.h _libxl_$*.h + mv __libxl_$*.c _libxl_$*.c -libxenlight.so: libxenlight.so.$(MAJOR) - ln -sf $< $@ @@ -24,9 +24,9 @@ - ln -sf $< $@ - -libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ +libxenlight.so: $(LIBXL_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -38,13 +38,13 @@ - ln -sf $< $@ - -libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_CFLAGS) -o $@ $^ +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ +libxlutil.so: $(LIBXLU_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ -@@ -95,13 +77,9 @@ +@@ -108,13 +90,9 @@ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) @@ -58,5 +58,5 @@ - ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so + $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) libxl.h _libxl_types.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh Modified: trunk/xen/debian/patches/tools-libxl-link.diff =============================================================================--- trunk/xen/debian/patches/tools-libxl-link.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-libxl-link.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,53 +1,60 @@ --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile -@@ -9,7 +9,8 @@ +@@ -9,9 +9,12 @@ CFLAGS += -I. -fPIC - CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) + CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) --LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) -+LDFLAGS_XL = -Wl,-rpath-link,$(XEN_LIBXC),-rpath-link,$(XEN_XENSTORE) -+LDFLAGS_LIBXL = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) - - LIBXL_OBJS-y = osdeps.o libxl_paths.o - LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y) -@@ -18,10 +19,8 @@ +-LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(UTIL_LIBS) ++LDLIBS_XL = $(LDLIBS_libxenctrl) ++LDLIBS_XL += -Wl,-rpath-link,$(XEN_LIBXC),-rpath-link,$(XEN_XENSTORE) $(LDRPATH_libblktapctl) ++LDLIBS_LIBXL = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) + ifeq ($(CONFIG_Linux),y) +-LIBS += -luuid ++LDLIBS_XL += -luuid ++LDLIBS_LIBXL += -lutil + endif + + LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o +@@ -32,12 +35,10 @@ AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o -CLIENTS = xl - + XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o + .PHONY: all -all: $(CLIENTS) libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ +all: xl libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ $(AUTOSRCS) $(AUTOINCS) - $(AUTOINCS): $(AUTOSRCS) -@@ -47,7 +46,7 @@ - libxl_paths.c: _libxl_paths.h + $(LIBXLU_OBJS): $(AUTOINCS) +@@ -69,7 +70,7 @@ + mv __libxl_$*.c _libxl_$*.c libxenlight.so: $(LIBXL_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_LIBXL) $(SHLIB_CFLAGS) -o $@ $^ +- $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^ libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ -@@ -67,8 +66,8 @@ - xl_cmdtable.o: xl_cmdtable.c - $(CC) $(CFLAGS) -c xl_cmdtable.c +@@ -80,8 +81,8 @@ + libxlutil.a: $(LIBXLU_OBJS) + $(AR) rcs libxlutil.a $^ --$(CLIENTS): xl.o xl_cmdimpl.o xl_cmdtable.o libxlutil.so libxenlight.so +-$(CLIENTS): $(XL_OBJS) libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -+xl: xl.o xl_cmdimpl.o xl_cmdtable.o libxlutil.so libxenlight.so -+ $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS_XL) ++xl: $(XL_OBJS) libxlutil.so libxenlight.so ++ $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_XL) .PHONY: install install: all -@@ -86,7 +85,7 @@ +@@ -99,7 +100,7 @@ .PHONY: clean clean: - $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS) + $(RM) -f _*.h *.o *.so* *.a xl $(DEPS) + $(RM) -f _*.c *.pyc _libxl_paths.*.tmp # $(RM) -f $(AUTOSRCS) $(AUTOINCS) - distclean: clean Modified: trunk/xen/debian/patches/tools-libxl-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-libxl-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-libxl-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,30 +1,45 @@ --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile -@@ -9,8 +9,8 @@ - CFLAGS += -I. -fPIC - CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) +@@ -16,6 +16,8 @@ + LDLIBS_XL += -luuid + LDLIBS_LIBXL += -lutil + endif ++LDFLAGS_XL = $(call LDFLAGS_RPATH,../lib) ++LDFLAGS_LIBXL = $(call LDFLAGS_RPATH) --LDFLAGS_XL = -Wl,-rpath-link,$(XEN_LIBXC),-rpath-link,$(XEN_XENSTORE) --LDFLAGS_LIBXL = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) -+LDFLAGS_XL = -Wl,-rpath-link,$(XEN_LIBXC),-rpath-link,$(XEN_XENSTORE) $(call LDFLAGS_RPATH,../lib) -+LDFLAGS_LIBXL = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH) + LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o + ifeq ($(LIBXL_BLKTAP),y) +@@ -70,7 +72,7 @@ + mv __libxl_$*.c _libxl_$*.c + + libxenlight.so: $(LIBXL_OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_LIBXL) $(LDLIBS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^ + + libxenlight.a: $(LIBXL_OBJS) + $(AR) rcs libxenlight.a $^ +@@ -82,18 +84,19 @@ + $(AR) rcs libxlutil.a $^ + + xl: $(XL_OBJS) libxlutil.so libxenlight.so +- $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_XL) ++ $(CC) $(LDFLAGS) $(LDFLAGS_XL) -o $@ $^ $(LDLIBS_XL) - LIBXL_OBJS-y = osdeps.o libxl_paths.o - LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y) -@@ -72,13 +72,14 @@ .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) +- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) ++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) - $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) +- $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR) + $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR) - $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(LIBDIR) + $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) libxl.h _libxl_types.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh Modified: trunk/xen/debian/patches/tools-misc-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-misc-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-misc-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,26 +1,6 @@ --- a/tools/misc/Makefile +++ b/tools/misc/Makefile -@@ -18,13 +18,12 @@ - SUBDIRS-$(CONFIG_MINITERM) += miniterm - SUBDIRS := $(SUBDIRS-y) - --INSTALL_BIN-y := xencons --INSTALL_BIN-$(CONFIG_X86) += xen-detect --INSTALL_BIN := $(INSTALL_BIN-y) -- --INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof --INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx --INSTALL_SBIN := $(INSTALL_SBIN-y) -+INSTALL_TARGETS-y += xencons -+INSTALL_TARGETS-$(CONFIG_X86) += xen-detect -+ -+INSTALL_TARGETS-y += xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof -+INSTALL_TARGETS-$(CONFIG_X86) += xen-hvmctx -+INSTALL_TARGETS := $(INSTALL_TARGETS-y) - - .PHONY: all - all: build -@@ -35,10 +34,8 @@ +@@ -37,10 +37,8 @@ .PHONY: install install: build @@ -29,7 +9,7 @@ - $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR) - $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) -+ $(INSTALL_PYTHON_PROG) $(INSTALL_TARGETS) $(DESTDIR)$(PRIVATE_BINDIR) ++ $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(INSTALL_SBIN) $(DESTDIR)$(PRIVATE_BINDIR) set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done .PHONY: clean Modified: trunk/xen/debian/patches/tools-misc-rpath.diff =============================================================================--- trunk/xen/debian/patches/tools-misc-rpath.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-misc-rpath.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,11 +1,11 @@ --- a/tools/misc/Makefile +++ b/tools/misc/Makefile -@@ -47,7 +47,7 @@ +@@ -50,7 +50,7 @@ $(CC) -c $(CFLAGS) -o $@ $< - xen-hvmctx xenperf xenpm gtracestat xenlockprof: %: %.o Makefile -- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) -+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) $(call LDFLAGS_RPATH,../lib) + xen-hvmctx xen-hvmcrash xenperf xenpm gtracestat xenlockprof xen-hptool xenwatchdogd: %: %.o Makefile +- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) ++ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(call LDFLAGS_RPATH,../lib) gtraceview: %: %.o Makefile $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CURSES_LIBS) Modified: trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch =============================================================================--- trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch Wed Mar 16 16:18:07 2011 (r831) @@ -8,7 +8,7 @@ import curses, _curses, curses.wrapper, curses.textpad, curses.ascii import getopt -@@ -578,48 +577,6 @@ +@@ -585,48 +584,6 @@ return grubcfg @@ -57,15 +57,15 @@ def sniff_netware(fs, cfg): if not fs.file_exists("/nwserver/xnloader.sys"): return cfg -@@ -706,10 +663,7 @@ - else: - fs = fsimage.open(file, get_fs_offset(file)) +@@ -751,10 +708,7 @@ + try: + fs = fsimage.open(file, offset, bootfsoptions) -- chosencfg = sniff_solaris(fs, incfg) +- chosencfg = sniff_solaris(fs, incfg) - -- if not chosencfg["kernel"]: -- chosencfg = sniff_netware(fs, incfg) -+ chosencfg = sniff_netware(fs, incfg) +- if not chosencfg["kernel"]: +- chosencfg = sniff_netware(fs, incfg) ++ chosencfg = sniff_netware(fs, incfg) - if not chosencfg["kernel"]: - chosencfg = run_grub(file, entry, fs, incfg["args"]) + if not chosencfg["kernel"]: + chosencfg = run_grub(file, entry, fs, incfg["args"]) Modified: trunk/xen/debian/patches/tools-python-rpath.diff =============================================================================--- trunk/xen/debian/patches/tools-python-rpath.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-python-rpath.diff Wed Mar 16 16:18:07 2011 (r831) @@ -8,7 +8,7 @@ include_dirs = [ XEN_ROOT + "/tools/libxc", XEN_ROOT + "/tools/xenstore", -@@ -19,6 +20,7 @@ +@@ -37,6 +38,7 @@ xc = Extension("xc", extra_compile_args = extra_compile_args, @@ -16,7 +16,7 @@ include_dirs = include_dirs + [ "xen/lowlevel/xc" ], library_dirs = library_dirs, libraries = libraries, -@@ -26,6 +28,7 @@ +@@ -45,6 +47,7 @@ xs = Extension("xs", extra_compile_args = extra_compile_args, @@ -24,7 +24,7 @@ include_dirs = include_dirs + [ "xen/lowlevel/xs" ], library_dirs = library_dirs, libraries = libraries, -@@ -33,6 +36,7 @@ +@@ -53,6 +56,7 @@ scf = Extension("scf", extra_compile_args = extra_compile_args, @@ -32,7 +32,7 @@ include_dirs = include_dirs + [ "xen/lowlevel/scf" ], library_dirs = library_dirs, libraries = libraries, -@@ -47,6 +51,7 @@ +@@ -69,6 +73,7 @@ acm = Extension("acm", extra_compile_args = extra_compile_args, @@ -40,7 +40,7 @@ include_dirs = include_dirs + [ "xen/lowlevel/acm" ], library_dirs = library_dirs, libraries = libraries, -@@ -54,6 +59,7 @@ +@@ -77,6 +82,7 @@ flask = Extension("flask", extra_compile_args = extra_compile_args, @@ -48,7 +48,7 @@ include_dirs = include_dirs + [ "xen/lowlevel/flask" ] + [ "../flask/libflask/include" ], library_dirs = library_dirs + [ "../flask/libflask" ], -@@ -62,6 +68,7 @@ +@@ -86,6 +92,7 @@ ptsname = Extension("ptsname", extra_compile_args = extra_compile_args, @@ -56,7 +56,7 @@ include_dirs = include_dirs + [ "ptsname" ], library_dirs = library_dirs, libraries = libraries, -@@ -69,6 +76,7 @@ +@@ -94,6 +101,7 @@ checkpoint = Extension("checkpoint", extra_compile_args = extra_compile_args, @@ -64,7 +64,7 @@ include_dirs = include_dirs, library_dirs = library_dirs, libraries = libraries + [ "rt" ], -@@ -77,6 +85,7 @@ +@@ -103,6 +111,7 @@ netlink = Extension("netlink", extra_compile_args = extra_compile_args, @@ -72,3 +72,11 @@ include_dirs = include_dirs, library_dirs = library_dirs, libraries = libraries, +@@ -112,6 +121,7 @@ + + xl = Extension("xl", + extra_compile_args = extra_compile_args, ++ extra_link_args = extra_link_args, + include_dirs = include_dirs + [ "xen/lowlevel/xl" ], + library_dirs = library_dirs, + libraries = libraries + ["xenlight" ] + blktap_ctl_libs + uuid_libs, Modified: trunk/xen/debian/patches/tools-python-xen-relative-path.diff =============================================================================--- trunk/xen/debian/patches/tools-python-xen-relative-path.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-python-xen-relative-path.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,6 +1,6 @@ --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py -@@ -704,45 +704,39 @@ +@@ -708,45 +708,39 @@ return None config_image = [ vals.builder ] if vals.kernel: @@ -56,7 +56,7 @@ else: raise ValueError(''Cannot find loader "%s"'' % vals.loader) if vals.cmdline_ip: -@@ -1072,7 +1066,7 @@ +@@ -1076,7 +1070,7 @@ args = [ ''acpi'', ''apic'', ''boot'', ''cpuid'', ''cpuid_check'', @@ -65,7 +65,7 @@ ''fda'', ''fdb'', ''gfx_passthru'', ''guest_os_type'', ''hap'', ''hpet'', -@@ -1094,6 +1088,8 @@ +@@ -1098,6 +1092,8 @@ for a in args: if a in vals.__dict__ and vals.__dict__[a] is not None: config_image.append([a, vals.__dict__[a]]) @@ -74,7 +74,7 @@ if vals.vncpasswd is not None: config_image.append([''vncpasswd'', vals.vncpasswd]) -@@ -1160,10 +1156,9 @@ +@@ -1166,10 +1162,9 @@ config_image = configure_image(vals) if vals.bootloader: @@ -109,7 +109,7 @@ log.debug("[xc_restore]: %s", string.join(cmd)) --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py -@@ -480,11 +480,11 @@ +@@ -493,11 +493,11 @@ if self.is_hvm() or self.has_rfb(): if ''device_model'' not in self[''platform'']: @@ -120,10 +120,10 @@ self[''platform''][''device_model''] = \ - auxbin.pathTo(self[''platform''][''device_model'']) + auxbin.path_bin(self[''platform''][''device_model'']) - if not os.path.exists(self[''platform''][''device_model'']): - raise VmError("device model ''%s'' not found" % str(self[''platform''][''device_model''])) - -@@ -511,14 +511,14 @@ + # If the device_model is not set the os.path.exists() would raise + # an exception so we return our error message instead if applicable + if not self[''platform''][''device_model'']: +@@ -528,14 +528,14 @@ # Old configs may have hvmloader set as PV_kernel param if self.has_key(''PV_kernel'') and self[''PV_kernel''] != '''': if self[''PV_kernel''] == ''hvmloader'': @@ -141,7 +141,7 @@ if not os.path.exists(self[''platform''][''loader'']): raise VmError("kernel ''%s'' not found" % str(self[''platform''][''loader''])) -@@ -1638,7 +1638,7 @@ +@@ -1662,7 +1662,7 @@ # is invoked for pvfb services if ''device_model'' not in target[''platform'']: target[''platform''][''device_model''] = \ @@ -152,7 +152,7 @@ # as well that is not really exposed to Xen API --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py -@@ -3215,7 +3215,7 @@ +@@ -3233,7 +3233,7 @@ else: # Boot using bootloader if not blexec or blexec == ''pygrub'': Modified: trunk/xen/debian/patches/tools-xcutils-rpath.diff =============================================================================--- trunk/xen/debian/patches/tools-xcutils-rpath.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-xcutils-rpath.diff Wed Mar 16 16:18:07 2011 (r831) @@ -4,8 +4,8 @@ PROGRAMS = xc_restore xc_save readnotes lsevtchn --LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) -+LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH,../lib) +-LDLIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) ++LDLIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(call LDFLAGS_RPATH,../lib) .PHONY: all all: build Modified: trunk/xen/debian/patches/tools-xenmon-rpath.diff =============================================================================--- trunk/xen/debian/patches/tools-xenmon-rpath.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-xenmon-rpath.diff Wed Mar 16 16:18:07 2011 (r831) @@ -3,7 +3,7 @@ @@ -17,6 +17,7 @@ CFLAGS += -I $(XEN_XC) CFLAGS += $(CFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenctrl) + LDLIBS += $(LDLIBS_libxenctrl) +LDFLAGS += $(call LDFLAGS_RPATH,../lib) BIN = xentrace_setmask xenbaked Modified: trunk/xen/debian/patches/tools-xenpaging-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-xenpaging-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-xenpaging-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -4,15 +4,15 @@ CFLAGS += -I $(XEN_XC) CFLAGS += -I ./ CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) --LDFLAGS += $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -+LDFLAGS += $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH,../lib) +-LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) ++LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(call LDFLAGS_RPATH,../lib) POLICY = default -@@ -30,8 +30,8 @@ - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ +@@ -28,8 +28,8 @@ install: all + $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/xenpaging - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) Modified: trunk/xen/debian/patches/tools-xenstore-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-xenstore-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-xenstore-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -1,21 +1,28 @@ --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile -@@ -95,18 +95,19 @@ +@@ -47,7 +47,7 @@ + endif + + xenstored: $(XENSTORED_OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(call LDFLAGS_RPATH,../lib) $(SOCKET_LIBS) -o $@ + + $(CLIENTS): xenstore + ln -f xenstore $@ +@@ -92,16 +92,16 @@ .PHONY: install install: all +- $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) - ifneq ($(CONFIG_OCAML_XENSTORED),y) + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored - $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) -+ $(INSTALL_PROG) xenstored $(DESTDIR)$(PRIVATE_BINDIR) - endif - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) - $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) ++ $(INSTALL_PROG) xenstored $(DESTDIR)$(PRIVATE_BINDIR) + $(INSTALL_PROG) xenstore-control $(DESTDIR)$(PRIVATE_BINDIR) + $(INSTALL_PROG) xenstore $(DESTDIR)$(SBINDIR) set -e ; for c in $(CLIENTS) ; do \ Modified: trunk/xen/debian/patches/tools-xenstore-rpath.diff =============================================================================--- trunk/xen/debian/patches/tools-xenstore-rpath.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-xenstore-rpath.diff Wed Mar 16 16:18:07 2011 (r831) @@ -7,5 +7,5 @@ +LDFLAGS_libxenctrl += $(call LDFLAGS_RPATH,../lib) + CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod - CLIENTS += xenstore-write xenstore-ls + CLIENTS += xenstore-write xenstore-ls xenstore-watch Modified: trunk/xen/debian/patches/tools-xentrace-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-xentrace-prefix.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-xentrace-prefix.diff Wed Mar 16 16:18:07 2011 (r831) @@ -10,9 +10,10 @@ $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) -+ $(INSTALL_PROG) $(BIN) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR) +- $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR) - [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR) ++ $(INSTALL_PROG) $(BIN) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR) ++ $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) Modified: trunk/xen/debian/patches/tools-xentrace-rpath.diff =============================================================================--- trunk/xen/debian/patches/tools-xentrace-rpath.diff Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/tools-xentrace-rpath.diff Wed Mar 16 16:18:07 2011 (r831) @@ -3,7 +3,7 @@ @@ -5,6 +5,7 @@ CFLAGS += $(CFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenctrl) + LDLIBS += $(LDLIBS_libxenctrl) +LDFLAGS += $(call LDFLAGS_RPATH,../lib) HDRS = $(wildcard *.h) Modified: trunk/xen/debian/patches/version.patch =============================================================================--- trunk/xen/debian/patches/version.patch Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/patches/version.patch Wed Mar 16 16:18:07 2011 (r831) @@ -31,7 +31,7 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s --- a/xen/common/kernel.c +++ b/xen/common/kernel.c -@@ -177,8 +177,8 @@ +@@ -226,8 +226,8 @@ { struct xen_compile_info info; safe_strcpy(info.compiler, xen_compiler()); @@ -85,7 +85,7 @@ -} --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c -@@ -572,14 +572,11 @@ +@@ -573,14 +573,11 @@ serial_set_rx_handler(sercon_handle, serial_rx); /* HELLO WORLD --- start-of-day banner text. */ Modified: trunk/xen/debian/rules.real =============================================================================--- trunk/xen/debian/rules.real Mon Mar 14 21:28:33 2011 (r830) +++ trunk/xen/debian/rules.real Wed Mar 16 16:18:07 2011 (r831) @@ -85,7 +85,8 @@ $(STAMPS_DIR)/install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH) @rm -rf $(INSTALL_DIR) +$(MAKE_CLEAN) -C $(DIR)/tools install DESTDIR=$(CURDIR)/$(INSTALL_DIR) $(CONFIG) - strip --remove-section=.comment --remove-section=.note $(INSTALL_DIR)/usr/lib/xen*/boot/* + # hvmloader + #strip --remove-section=.comment --remove-section=.note $(INSTALL_DIR)/usr/lib/xen*/boot/* touch $@ install-base: