[Pkg-xen-changes] r556 - trunk/xen-unstable/debian/patches

Bastian Blank waldi at alioth.debian.org
Mon May 12 13:07:03 UTC 2008 

Author: waldi
Date: Mon May 12 13:07:03 2008
New Revision: 556

Log:
debian/patches: Update.


Modified:
   trunk/xen-unstable/debian/patches/tools-lib-abiname.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/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 May 12 13:07:03 2008
@@ -10,7 +10,7 @@
  CTRL_SRCS-y       :=
  ifneq ($(stubdom),y)
  CTRL_SRCS-y       += xc_core.c
-@@ -82,12 +79,12 @@
+@@ -81,12 +78,12 @@
  
  LIB := libxenctrl.a
  ifneq ($(stubdom),y)
@@ -25,7 +25,7 @@
  endif
  
  .PHONY: all
-@@ -104,16 +101,12 @@
+@@ -103,16 +100,12 @@
  install: build
  	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -44,7 +44,7 @@
  	$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
  
  .PHONY: TAGS
-@@ -141,26 +134,16 @@
+@@ -140,26 +133,16 @@
  libxenctrl.a: $(CTRL_LIB_OBJS)
  	$(AR) rc $@ $^
  
@@ -88,7 +88,7 @@
  
  CFLAGS   += -I.
  CFLAGS   += $(CFLAGS_libxenctrl)
-@@ -27,7 +25,7 @@
+@@ -28,7 +26,7 @@
  OBJS_PIC = $(SRCS:.c=.opic)
  IBINS   :=
  
@@ -97,7 +97,7 @@
  
  .PHONY: all
  all: $(LIB)
-@@ -37,19 +35,15 @@
+@@ -38,19 +36,15 @@
  	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
  	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(PRIVATE_LIBDIR)
@@ -243,7 +243,7 @@
  libxenstore.a: xs.o xs_lib.o
  	$(AR) rcs $@ $^
 @@ -108,9 +100,7 @@
- 		ln -f xenstore $(DESTDIR)$(PRIVATE_BINDIR)/$${c} ; \
+ 		ln -f $(DESTDIR)$(PRIVATE_BINDIR)/xenstore $(DESTDIR)$(PRIVATE_BINDIR)/$${c} ; \
  	done
  	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
 -	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)

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 May 12 13:07:03 2008
@@ -88,7 +88,7 @@
  SUBDIRS += rombios
 --- xen-unstable.orig/tools/blktap/lib/Makefile
 +++ xen-unstable/tools/blktap/lib/Makefile
-@@ -34,11 +34,11 @@
+@@ -35,11 +35,11 @@
  
  .PHONY: install
  install: all
@@ -173,7 +173,7 @@
  
 --- xen-unstable.orig/tools/libxc/Makefile
 +++ xen-unstable/tools/libxc/Makefile
-@@ -102,18 +102,18 @@
+@@ -101,18 +101,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 May 12 13:07:03 2008
@@ -1,6 +1,6 @@
 --- xen-unstable.orig/tools/python/xen/xm/create.py
 +++ xen-unstable/tools/python/xen/xm/create.py
-@@ -570,6 +570,14 @@
+@@ -578,6 +578,14 @@
      else:
          return s
  
@@ -15,7 +15,7 @@
  def configure_image(vals):
      """Create the image config.
      """
-@@ -577,11 +585,11 @@
+@@ -585,11 +593,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])
-@@ -750,7 +758,7 @@
+@@ -758,7 +766,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',
-@@ -760,6 +768,8 @@
+@@ -768,6 +776,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 May 12 13:07:03 2008
@@ -111,12 +111,11 @@
  all: build
 --- xen-unstable.orig/tools/xenstat/xentop/Makefile
 +++ xen-unstable/tools/xenstat/xentop/Makefile
-@@ -19,7 +19,7 @@
- else
+@@ -19,6 +19,7 @@
  
  CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
--LDFLAGS += -L$(XEN_LIBXENSTAT)
-+LDFLAGS += -L$(XEN_LIBXENSTAT) $(call LDFLAGS_RPATH,../lib)
+ LDFLAGS += -L$(XEN_LIBXENSTAT)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
  LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
  CFLAGS += -DHOST_$(XEN_OS)
  
@@ -130,12 +129,11 @@
 +	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) $(call LDFLAGS_RPATH,../lib)
 --- xen-unstable.orig/tools/xentrace/Makefile
 +++ xen-unstable/tools/xentrace/Makefile
-@@ -4,7 +4,7 @@
- CFLAGS  += -Werror
+@@ -4,6 +4,7 @@
  
  CFLAGS  += $(CFLAGS_libxenctrl)
--LDFLAGS += $(LDFLAGS_libxenctrl)
-+LDFLAGS += $(LDFLAGS_libxenctrl) $(call LDFLAGS_RPATH,../lib)
+ LDFLAGS += $(LDFLAGS_libxenctrl)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
  
  HDRS     = $(wildcard *.h)
  OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
@@ -151,23 +149,21 @@
  
 --- xen-unstable.orig/tools/xenmon/Makefile
 +++ xen-unstable/tools/xenmon/Makefile
-@@ -16,7 +16,7 @@
- CFLAGS  += -Werror
+@@ -16,6 +16,7 @@
  CFLAGS  += -I $(XEN_XC)
  CFLAGS  += $(CFLAGS_libxenctrl)
--LDFLAGS += $(LDFLAGS_libxenctrl)
-+LDFLAGS += $(LDFLAGS_libxenctrl) $(call LDFLAGS_RPATH,../lib)
+ LDFLAGS += $(LDFLAGS_libxenctrl)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
  
  BIN = xentrace_setmask xenbaked
  SCRIPTS = xenmon.py
 --- xen-unstable.orig/tools/libfsimage/Rules.mk
 +++ xen-unstable/tools/libfsimage/Rules.mk
-@@ -3,7 +3,7 @@
- DEPS = .*.d
+@@ -3,6 +3,7 @@
  
  CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -Wp,-MD,.$(@F).d
--LDFLAGS += -L../common/
-+LDFLAGS += -L../common/ $(call LDFLAGS_RPATH,../../)
+ LDFLAGS += -L../common/
++LDFLAGS += $(call LDFLAGS_RPATH,../../)
  
  PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))

More information about the Pkg-xen-changes mailing list