[Pkg-xen-changes] r550 - in trunk/xen-unstable/debian: . patches

Bastian Blank waldi at alioth.debian.org
Mon Apr 14 20:31:25 UTC 2008 

Author: waldi
Date: Mon Apr 14 20:31:25 2008
New Revision: 550

Log:
* debian/changelog: Set version to 3.3-unstable+hg17445-1.
* debian/patches: Update.


Removed:
   trunk/xen-unstable/debian/patches/doc-remove-unused.diff
Modified:
   trunk/xen-unstable/debian/changelog
   trunk/xen-unstable/debian/patches/series
   trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
   trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff
   trunk/xen-unstable/debian/patches/tools-misc-xend-race.diff
   trunk/xen-unstable/debian/patches/tools-prefix.diff
   trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
   trunk/xen-unstable/debian/patches/tools-rpath.diff

Modified: trunk/xen-unstable/debian/changelog
==============================================================================
--- trunk/xen-unstable/debian/changelog	(original)
+++ trunk/xen-unstable/debian/changelog	Mon Apr 14 20:31:25 2008
@@ -1,4 +1,4 @@
-xen-unstable (3.3-unstable+hg17192-2) UNRELEASED; urgency=low
+xen-unstable (3.3-unstable+hg17445-1) UNRELEASED; urgency=low
 
   * Provide correct directory to dh_pycentral.
 

Modified: trunk/xen-unstable/debian/patches/series
==============================================================================
--- trunk/xen-unstable/debian/patches/series	(original)
+++ trunk/xen-unstable/debian/patches/series	Mon Apr 14 20:31:25 2008
@@ -10,4 +10,3 @@
 tools-pygrub-prefix.diff
 tools-libfsimage-prefix.diff
 tools-misc-xend-race.diff
-doc-remove-unused.diff

Modified: trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-lib-abiname.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-lib-abiname.diff	Mon Apr 14 20:31:25 2008
@@ -10,7 +10,7 @@
  CTRL_SRCS-y       :=
  ifneq ($(stubdom),y)
  CTRL_SRCS-y       += xc_core.c
-@@ -81,12 +78,12 @@
+@@ -82,12 +79,12 @@
  
  LIB := libxenctrl.a
  ifneq ($(stubdom),y)
@@ -25,7 +25,7 @@
  endif
  
  .PHONY: all
-@@ -103,16 +100,12 @@
+@@ -104,16 +101,12 @@
  install: build
  	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -44,7 +44,7 @@
  	$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
  
  .PHONY: TAGS
-@@ -140,26 +133,16 @@
+@@ -141,26 +134,16 @@
  libxenctrl.a: $(CTRL_LIB_OBJS)
  	$(AR) rc $@ $^
  
@@ -86,18 +86,18 @@
 -SONAME   = libblktap.so.$(MAJOR)
 +SONAME   = libblktap.so
  
- INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I$(XEN_INCLUDE) $(CFLAGS_libxenstore)
- 
-@@ -26,7 +24,7 @@
- OBJS     = $(patsubst %.c,%.o,$(SRCS))
+ CFLAGS   += -I.
+ CFLAGS   += $(CFLAGS_libxenctrl)
+@@ -27,7 +25,7 @@
+ OBJS_PIC = $(SRCS:.c=.opic)
  IBINS   :=
  
 -LIB      = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
 +LIB      = libblktap.a libblktap.so
  
  .PHONY: all
- all: build
-@@ -41,19 +39,15 @@
+ all: $(LIB)
+@@ -37,19 +35,15 @@
  	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
  	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(PRIVATE_LIBDIR)
@@ -105,20 +105,20 @@
 -	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so
  	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
  
+ .PHONY: clean
  clean:
  	rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
  
- libblktap.a: $(OBJS) 
+-libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC) 
 -	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
++libblktap.so: $(OBJS_PIC) 
 +	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
- 	      -L$(XEN_XENSTORE) $(LDFLAGS)                                 \
--	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
+ 	      $(LDFLAGS) -o $@ $^
 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
 -	ln -sf libblktap.so.$(MAJOR) libblktap.so
-+	      -o libblktap.so $^ $(LIBS)
- 	$(AR) rc $@ libblktap.so
  
- .PHONY: TAGS all build clean install libblktap
+ libblktap.a: $(OBJS) 
+ 	$(AR) rc $@ $^
 --- xen-unstable.orig/tools/libfsimage/common/Makefile
 +++ xen-unstable/tools/libfsimage/common/Makefile
 @@ -1,9 +1,6 @@
@@ -214,35 +214,37 @@
  -include $(DEPS)
 --- xen-unstable.orig/tools/xenstore/Makefile
 +++ xen-unstable/tools/xenstore/Makefile
-@@ -2,9 +2,6 @@
+@@ -1,9 +1,6 @@
+ XEN_ROOT=../..
  include $(XEN_ROOT)/tools/Rules.mk
- XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
  
 -MAJOR = 3.0
 -MINOR = 0
 -
- PROFILE=#-pg
- BASECFLAGS=-Werror
- # Make gcc generate dependencies.
-@@ -62,13 +59,8 @@
+ CFLAGS += -Werror
+ CFLAGS += -I.
+ CFLAGS += $(CFLAGS_libxenctrl)
+@@ -66,15 +63,10 @@
  xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
  
 -libxenstore.so: libxenstore.so.$(MAJOR)
 -	ln -sf $< $@
 -libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR)
 -	ln -sf $< $@
 -
+ xs.opic: CFLAGS += -DUSE_PTHREAD
+ 
 -libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
 -	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread
 +libxenstore.so: xs.opic xs_lib.opic
 +	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread
  
  libxenstore.a: xs.o xs_lib.o
- 	$(AR) rcs libxenstore.a $^
-@@ -100,9 +92,7 @@
- 	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(PRIVATE_BINDIR)
- 	$(INSTALL_PROG) xenstore-ls $(DESTDIR)$(PRIVATE_BINDIR)
+ 	$(AR) rcs $@ $^
+@@ -108,9 +100,7 @@
+ 		ln -f xenstore $(DESTDIR)$(PRIVATE_BINDIR)/$${c} ; \
+ 	done
  	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
 -	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
 -	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenstore.so.$(MAJOR)

Modified: trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff	Mon Apr 14 20:31:25 2008
@@ -1,6 +1,6 @@
 --- xen-unstable.orig/tools/libfsimage/Rules.mk
 +++ xen-unstable/tools/libfsimage/Rules.mk
-@@ -7,11 +7,7 @@
+@@ -7,12 +7,7 @@
  
  PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
  
@@ -8,6 +8,7 @@
 -FSDIR-$(CONFIG_SunOS)-x86_64 = $(PREFIX)/lib/fs/$(FS)/64
 -FSDIR-$(CONFIG_SunOS)-x86_32 = $(PREFIX)/lib/fs/$(FS)/
 -FSDIR-$(CONFIG_SunOS) = $(FSDIR-$(CONFIG_SunOS)-$(XEN_TARGET_ARCH))
+-FSDIR-$(CONFIG_NetBSD) = $(LIBDIR)/fs/$(FS)
 -FSDIR = $(FSDIR-y)
 +FSDIR = $(PRIVATE_LIBDIR)/fs/$(FS)
  
@@ -26,12 +27,15 @@
  LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
 --- xen-unstable.orig/tools/libfsimage/common/fsimage_plugin.c
 +++ xen-unstable/tools/libfsimage/common/fsimage_plugin.c
-@@ -131,23 +131,8 @@
+@@ -131,26 +131,8 @@
  	int err;
  	int ret = -1;
  
--#ifdef __sun__
+-#if defined(FSIMAGE_FSDIR)
  	if (fsdir == NULL)
+-		fsdir = FSIMAGE_FSDIR;
+-#elif defined(__sun__)
+-	if (fsdir == NULL)
 -		fsdir = "/usr/lib/fs";
 -
 -	if (sizeof(void *) == 8)

Modified: trunk/xen-unstable/debian/patches/tools-misc-xend-race.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-misc-xend-race.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-misc-xend-race.diff	Mon Apr 14 20:31:25 2008
@@ -1,8 +1,8 @@
 # Wait a little bit before starting xenconsoled.
 
---- xen-3.orig/tools/misc/xend
-+++ xen-3/tools/misc/xend
-@@ -78,6 +78,8 @@
+--- xen-unstable.orig/tools/misc/xend
++++ xen-unstable/tools/misc/xend
+@@ -97,6 +97,8 @@
          execute('xenstored', args)
  
  def start_consoled():

Modified: trunk/xen-unstable/debian/patches/tools-prefix.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-prefix.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-prefix.diff	Mon Apr 14 20:31:25 2008
@@ -53,7 +53,7 @@
  install-dtd: all
 --- xen-unstable.orig/tools/ioemu/Makefile.target
 +++ xen-unstable/tools/ioemu/Makefile.target
-@@ -211,6 +211,7 @@
+@@ -212,6 +212,7 @@
  ifdef CONFIG_SOLARIS
  LIBS+=-lsocket -lnsl -lresolv
  endif
@@ -63,7 +63,7 @@
  ifdef TARGET_GPROF
 --- xen-unstable.orig/tools/ioemu/configure
 +++ xen-unstable/tools/ioemu/configure
-@@ -576,9 +576,9 @@
+@@ -598,9 +598,9 @@
      prefix="/usr/local"
  fi
  mandir="$prefix/share/man"
@@ -85,12 +85,12 @@
 +INST_DIR := $(DESTDIR)/usr/$(PREFIX)/boot
  
  SUBDIRS :=
- SUBDIRS += rombios rombios/32bit
+ SUBDIRS += rombios
 --- xen-unstable.orig/tools/blktap/lib/Makefile
 +++ xen-unstable/tools/blktap/lib/Makefile
-@@ -38,11 +38,11 @@
- libblktap: libblktap.a
+@@ -34,11 +34,11 @@
  
+ .PHONY: install
  install: all
 -	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 +	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
@@ -103,10 +103,10 @@
 +	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so
  	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
  
- clean:
+ .PHONY: clean
 --- xen-unstable.orig/tools/xenstore/Makefile
 +++ xen-unstable/tools/xenstore/Makefile
-@@ -96,18 +96,17 @@
+@@ -99,20 +99,19 @@
  install: all
  	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
  	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
@@ -115,18 +115,20 @@
 +	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
 -	$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
--	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(BINDIR)
 -	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
--	$(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR)
+-	$(INSTALL_PROG) xenstore $(DESTDIR)/usr/bin
++	$(INSTALL_PROG) xenstored $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) xenstore $(DESTDIR)$(PRIVATE_BINDIR)
+ 	set -e ; for c in $(CLIENTS) ; do \
+-		ln -f $(DESTDIR)/usr/bin/xenstore $(DESTDIR)/usr/bin/$${c} ; \
++		ln -f $(DESTDIR)/usr/bin/xenstore $(DESTDIR)$(PRIVATE_BINDIR)/$${c} ; \
+ 	done
 -	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 -	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
 -	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
 -	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
 -	$(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
-+	$(INSTALL_PROG) xenstored $(DESTDIR)$(PRIVATE_BINDIR)
-+	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(PRIVATE_BINDIR)
-+	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(PRIVATE_BINDIR)
-+	$(INSTALL_PROG) xenstore-ls $(DESTDIR)$(PRIVATE_BINDIR)
 +	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
 +	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
 +	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenstore.so.$(MAJOR)
@@ -171,7 +173,7 @@
  
 --- xen-unstable.orig/tools/libxc/Makefile
 +++ xen-unstable/tools/libxc/Makefile
-@@ -101,18 +101,18 @@
+@@ -102,18 +102,18 @@
  
  .PHONY: install
  install: build

Modified: trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff	Mon Apr 14 20:31:25 2008
@@ -1,6 +1,6 @@
 --- xen-unstable.orig/tools/python/xen/xm/create.py
 +++ xen-unstable/tools/python/xen/xm/create.py
-@@ -561,6 +561,14 @@
+@@ -570,6 +570,14 @@
      else:
          return s
  
@@ -15,7 +15,7 @@
  def configure_image(vals):
      """Create the image config.
      """
-@@ -568,11 +576,11 @@
+@@ -577,11 +585,11 @@
          return None
      config_image = [ vals.builder ]
      if vals.kernel:
@@ -30,7 +30,7 @@
      if vals.cmdline_ip:
          cmdline_ip = strip('ip=', vals.cmdline_ip)
          config_image.append(['ip', cmdline_ip])
-@@ -740,7 +748,7 @@
+@@ -750,7 +758,7 @@
  def configure_hvm(config_image, vals):
      """Create the config for HVM devices.
      """
@@ -39,7 +39,7 @@
               'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
               'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten',
               'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor',
-@@ -750,6 +758,8 @@
+@@ -760,6 +768,8 @@
      for a in args:
          if a in vals.__dict__ and vals.__dict__[a] is not None:
              config_image.append([a, vals.__dict__[a]])

Modified: trunk/xen-unstable/debian/patches/tools-rpath.diff
==============================================================================
--- trunk/xen-unstable/debian/patches/tools-rpath.diff	(original)
+++ trunk/xen-unstable/debian/patches/tools-rpath.diff	Mon Apr 14 20:31:25 2008
@@ -69,7 +69,7 @@
                 libraries          = libraries,
 --- xen-unstable.orig/tools/ioemu/Makefile.target
 +++ xen-unstable/tools/ioemu/Makefile.target
-@@ -528,6 +528,8 @@
+@@ -532,6 +532,8 @@
  VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc64.ld
  endif
  
@@ -80,7 +80,7 @@
  endif
 --- xen-unstable.orig/tools/libxc/Makefile
 +++ xen-unstable/tools/libxc/Makefile
-@@ -146,7 +146,7 @@
+@@ -147,7 +147,7 @@
  	ln -sf $< $@
  
  libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
@@ -89,7 +89,7 @@
  
  # libxenguest
  
-@@ -159,7 +159,7 @@
+@@ -160,7 +160,7 @@
  	ln -sf $< $@
  
  libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
@@ -102,7 +102,7 @@
 +++ xen-unstable/tools/xcutils/Makefile
 @@ -20,7 +20,7 @@
  
- PROGRAMS = xc_restore xc_save readnotes
+ 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)
@@ -173,38 +173,31 @@
  
 --- xen-unstable.orig/tools/xenstore/Makefile
 +++ xen-unstable/tools/xenstore/Makefile
-@@ -17,6 +17,9 @@
- CFLAGS  += $(BASECFLAGS)
- LDFLAGS += $(PROFILE)
+@@ -12,6 +12,9 @@
+ CFLAGS += -Wp,-MD,.$(@F).d
+ DEP    = .*.d
  
 +LDFLAGS_libxenctrl += $(call LDFLAGS_RPATH,../lib)
 +LDFLAGS_libxenstore = -L. -lxenstore $(call LDFLAGS_RPATH,../lib)
 +
  CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
- CLIENTS += xenstore-write
- CLIENTS_OBJS := $(patsubst xenstore-%,xenstore_%.o,$(CLIENTS))
-@@ -48,16 +51,16 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) $(LDFLAGS_libxenctrl) $(SOCKET_LIBS) -o $@
- 
- $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so
--	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) $(LDFLAGS_libxenstore) $(SOCKET_LIBS) -o $@
- 
- $(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c
- 	$(COMPILE.c) -DCLIENT_$(*F) -o $@ $<
- 
- xenstore-control: xenstore_control.o libxenstore.so
--	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) $(LDFLAGS_libxenstore) $(SOCKET_LIBS) -o $@
- 
- xenstore-ls: xsls.o libxenstore.so
--	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) $(LDFLAGS_libxenstore) $(SOCKET_LIBS) -o $@
+ CLIENTS += xenstore-write xenstore-ls
+ 
+@@ -55,10 +58,10 @@
+ 	ln -f xenstore $@
+ 
+ xenstore: xenstore_client.o $(LIBXENSTORE)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LDFLAGS_libxenstore) $(SOCKET_LIBS) -o $@
+ 
+ xenstore-control: xenstore_control.o $(LIBXENSTORE)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LDFLAGS_libxenstore) $(SOCKET_LIBS) -o $@
  
  xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
---- xen-3.orig/tools/pygrub/setup.py
-+++ xen-3/tools/pygrub/setup.py
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+--- xen-unstable.orig/tools/pygrub/setup.py
++++ xen-unstable/tools/pygrub/setup.py
 @@ -4,11 +4,13 @@
  import sys

More information about the Pkg-xen-changes mailing list