Author: waldi Date: Wed Mar 9 17:20:43 2011 New Revision: 829 Log: debian/patches: Reorder and refresh patches. Modified: trunk/xen/debian/patches/config-prefix.diff trunk/xen/debian/patches/series trunk/xen/debian/patches/tools-flask-abiname.diff trunk/xen/debian/patches/tools-flask-prefix.diff trunk/xen/debian/patches/tools-libfsimage-abiname.diff trunk/xen/debian/patches/tools-libfsimage-prefix.diff trunk/xen/debian/patches/tools-libxc-abiname.diff trunk/xen/debian/patches/tools-libxc-prefix.diff trunk/xen/debian/patches/tools-libxl-link.diff trunk/xen/debian/patches/tools-libxl-prefix.diff trunk/xen/debian/patches/version.patch Modified: trunk/xen/debian/patches/config-prefix.diff =============================================================================--- trunk/xen/debian/patches/config-prefix.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/config-prefix.diff Wed Mar 9 17:20:43 2011 (r829) @@ -45,7 +45,7 @@ LDFLAGS_DIRECT += -melf_x86_64_obsd --- a/Config.mk +++ b/Config.mk -@@ -32,14 +32,14 @@ +@@ -33,14 +33,14 @@ ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include Modified: trunk/xen/debian/patches/series =============================================================================--- trunk/xen/debian/patches/series Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/series Wed Mar 9 17:20:43 2011 (r829) @@ -2,6 +2,13 @@ docs-pdflatex.patch +tools-blktap2-link.diff +tools-blktap2-optimize.diff +tools-flask-abiname.diff +tools-libfsimage-abiname.diff +tools-libxc-abiname.diff +tools-libxl-link.diff + config-prefix.diff tools-rpath.diff tools-blktap2-prefix.diff @@ -27,13 +34,6 @@ tools-xentrace-prefix.diff tools-xentrace-rpath.diff -tools-blktap2-link.diff -tools-blktap2-optimize.diff -tools-flask-abiname.diff -tools-libfsimage-abiname.diff -tools-libxc-abiname.diff -tools-libxl-link.diff - tools-python-xen-relative-path.diff tools-misc-xend-startup.diff Modified: trunk/xen/debian/patches/tools-flask-abiname.diff =============================================================================--- trunk/xen/debian/patches/tools-flask-abiname.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/tools-flask-abiname.diff Wed Mar 9 17:20:43 2011 (r829) @@ -18,13 +18,13 @@ all: build @@ -34,10 +31,8 @@ install: build - $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) -+ $(INSTALL_PROG) libflask.so $(DESTDIR)$(PRIVATE_LIBDIR) - $(INSTALL_DATA) libflask.a $(DESTDIR)$(PRIVATE_LIBDIR) -- ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so.$(MAJOR) -- ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so +- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) libflask.so $(DESTDIR)$(LIBDIR) + $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR) +- ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR) +- ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so $(INSTALL_DATA) include/libflask.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm .PHONY: TAGS Modified: trunk/xen/debian/patches/tools-flask-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-flask-prefix.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/tools-flask-prefix.diff Wed Mar 9 17:20:43 2011 (r829) @@ -1,20 +1,14 @@ --- a/tools/flask/libflask/Makefile +++ b/tools/flask/libflask/Makefile -@@ -32,12 +32,12 @@ +@@ -29,9 +29,10 @@ .PHONY: install install: build -- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) -- $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR) -- ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR) -- ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so -+ $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) -+ $(INSTALL_DATA) libflask.a $(DESTDIR)$(PRIVATE_LIBDIR) -+ ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so.$(MAJOR) -+ ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so +- $(INSTALL_PROG) libflask.so $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) libflask.so $(DESTDIR)$(PRIVATE_LIBDIR) + $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) include/libflask.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm - .PHONY: TAGS Modified: trunk/xen/debian/patches/tools-libfsimage-abiname.diff =============================================================================--- trunk/xen/debian/patches/tools-libfsimage-abiname.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/tools-libfsimage-abiname.diff Wed Mar 9 17:20:43 2011 (r829) @@ -7,10 +7,10 @@ -MAJOR = 1.0 -MINOR = 0 - - CFLAGS += -DFSDIR="\"$(PRIVATE_LIBDIR)/fs\"" - LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS -@@ -14,7 +11,7 @@ + LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU + LDFLAGS = $(LDFLAGS-y) +@@ -12,7 +9,7 @@ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) @@ -19,18 +19,18 @@ .PHONY: all all: $(LIB) -@@ -23,9 +20,7 @@ +@@ -21,9 +18,7 @@ install: all - $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) -- ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libfsimage.so.$(MAJOR) -- ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libfsimage.so -+ $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(PRIVATE_LIBDIR) +- $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) +- ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR) +- ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so ++ $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR) -@@ -33,13 +28,8 @@ +@@ -31,13 +26,8 @@ clean distclean: rm -f $(PIC_OBJS) $(LIB) $(DEPS) Modified: trunk/xen/debian/patches/tools-libfsimage-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-libfsimage-prefix.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/tools-libfsimage-prefix.diff Wed Mar 9 17:20:43 2011 (r829) @@ -16,28 +16,24 @@ --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile -@@ -4,6 +4,8 @@ - MAJOR = 1.0 - MINOR = 0 +@@ -1,6 +1,8 @@ + XEN_ROOT = ../../.. + include $(XEN_ROOT)/tools/Rules.mk +CFLAGS += -DFSDIR="\"$(PRIVATE_LIBDIR)/fs\"" + LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU LDFLAGS = $(LDFLAGS-y) -@@ -19,11 +21,11 @@ +@@ -16,9 +18,9 @@ .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) -- ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR) -- ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so -+ $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) -+ ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libfsimage.so.$(MAJOR) -+ ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libfsimage.so +- $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR) Modified: trunk/xen/debian/patches/tools-libxc-abiname.diff =============================================================================--- trunk/xen/debian/patches/tools-libxc-abiname.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/tools-libxc-abiname.diff Wed Mar 9 17:20:43 2011 (r829) @@ -27,20 +27,20 @@ .PHONY: all @@ -99,16 +96,12 @@ install: build - $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) -+ $(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(PRIVATE_LIBDIR) +- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) -- ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so.$(MAJOR) -- ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so +- 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_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) -+ $(INSTALL_PROG) libxenguest.so $(DESTDIR)$(PRIVATE_LIBDIR) +- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) libxenguest.so $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) -- ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so.$(MAJOR) -- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so +- ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) +- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS @@ -54,9 +54,9 @@ - ln -sf $< $@ - -libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS) +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS) +libxenctrl.so: $(CTRL_PIC_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ $(PTHREAD_LIBS) # libxenguest @@ -77,10 +77,10 @@ -libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(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) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) +- $(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) -+libxenguest.so: $(GUEST_PIC_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) ++libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) -include $(DEPS) Modified: trunk/xen/debian/patches/tools-libxc-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-libxc-prefix.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/tools-libxc-prefix.diff Wed Mar 9 17:20:43 2011 (r829) @@ -1,46 +1,37 @@ --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile -@@ -97,18 +97,18 @@ +@@ -94,13 +94,14 @@ .PHONY: install install: build -- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) -+ $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) +- $(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(PRIVATE_LIBDIR) $(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 -+ ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so.$(MAJOR) -+ ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenctrl.so $(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR) -- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) -+ $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) +- $(INSTALL_PROG) libxenguest.so $(DESTDIR)$(LIBDIR) ++ $(INSTALL_PROG) libxenguest.so $(DESTDIR)$(PRIVATE_LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) -- ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) -- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so -+ ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so.$(MAJOR) -+ ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenguest.so $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) - .PHONY: TAGS -@@ -142,7 +142,7 @@ - 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) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $^ $(PTHREAD_LIBS) +@@ -130,7 +131,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) # libxenguest -@@ -174,7 +174,7 @@ +@@ -157,7 +158,7 @@ - libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(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) -+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) + libxenguest.so: LDFLAGS += $(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) Modified: trunk/xen/debian/patches/tools-libxl-link.diff =============================================================================--- trunk/xen/debian/patches/tools-libxl-link.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/tools-libxl-link.diff Wed Mar 9 17:20:43 2011 (r829) @@ -4,9 +4,9 @@ CFLAGS += -I. -fPIC CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) --LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH,../lib) -+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) +-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) @@ -42,7 +42,7 @@ .PHONY: install install: all -@@ -109,7 +108,7 @@ +@@ -108,7 +107,7 @@ .PHONY: clean clean: Modified: trunk/xen/debian/patches/tools-libxl-prefix.diff =============================================================================--- trunk/xen/debian/patches/tools-libxl-prefix.diff Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/tools-libxl-prefix.diff Wed Mar 9 17:20:43 2011 (r829) @@ -1,15 +1,17 @@ --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile -@@ -15,7 +15,7 @@ +@@ -15,8 +15,8 @@ CFLAGS += -I. -fPIC CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) --LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) -+LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(call LDFLAGS_RPATH,../lib) +-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_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) -@@ -90,18 +90,19 @@ +@@ -89,18 +89,19 @@ .PHONY: install install: all Modified: trunk/xen/debian/patches/version.patch =============================================================================--- trunk/xen/debian/patches/version.patch Wed Mar 9 16:40:34 2011 (r828) +++ trunk/xen/debian/patches/version.patch Wed Mar 9 17:20:43 2011 (r829) @@ -85,7 +85,7 @@ -} --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c -@@ -576,14 +576,11 @@ +@@ -572,14 +572,11 @@ serial_set_rx_handler(sercon_handle, serial_rx); /* HELLO WORLD --- start-of-day banner text. */