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

Bastian Blank waldi at alioth.debian.org
Wed Mar 9 14:19:55 UTC 2011


Author: waldi
Date: Wed Mar  9 14:19:54 2011
New Revision: 825

Log:
* debian/changelog: Update.
* debian/patches/series: Add new patches.
* debian/patches/tools-blktap2-link.diff: Fix linking.
* debian/patches/tools-blktap2-optimize.diff: Remove optimization.
* debian/patches/tools-blktap2-prefix.diff: Fix rpath.

Added:
   trunk/xen/debian/patches/tools-blktap2-link.diff
   trunk/xen/debian/patches/tools-blktap2-optimize.diff
Modified:
   trunk/xen/debian/changelog
   trunk/xen/debian/patches/series
   trunk/xen/debian/patches/tools-blktap2-prefix.diff

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Wed Mar  9 14:17:13 2011	(r824)
+++ trunk/xen/debian/changelog	Wed Mar  9 14:19:54 2011	(r825)
@@ -8,6 +8,8 @@
   * Enable blktap2.
     - Use own md5 implementation.
     - Fix includes.
+    - Fix linking of blktap2 binaries.
+    - Remove optimization setting.
 
  -- Bastian Blank <waldi at debian.org>  Tue, 08 Mar 2011 13:21:34 +0100
 

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Wed Mar  9 14:17:13 2011	(r824)
+++ trunk/xen/debian/patches/series	Wed Mar  9 14:19:54 2011	(r825)
@@ -28,6 +28,8 @@
 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

Added: trunk/xen/debian/patches/tools-blktap2-link.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-blktap2-link.diff	Wed Mar  9 14:19:54 2011	(r825)
@@ -0,0 +1,29 @@
+--- a/tools/blktap2/drivers/Makefile
++++ b/tools/blktap2/drivers/Makefile
+@@ -15,7 +15,6 @@
+ CFLAGS    += -I../lib -I../../libxc
+ CFLAGS    += -I../include -I../../include
+ CFLAGS    += $(CFLAGS_libxenctrl)
+-CFLAGS    += -I $(LIBAIO_DIR)
+ CFLAGS    += -I $(MEMSHR_DIR)
+ CFLAGS    += -D_GNU_SOURCE
+ CFLAGS    += -DUSE_NFS_LOCKS
+@@ -53,7 +52,6 @@
+ 
+ $(REMUS-OBJS): CFLAGS += -I$(XEN_XENSTORE)
+ 
+-LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src
+ MEMSHR_DIR = $(XEN_ROOT)/tools/memshr
+ 
+ MEMSHRLIBS :=
+@@ -62,8 +60,8 @@
+ MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
+ endif
+ 
+-tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := $(LIBAIO_DIR)/libaio.a 
+-tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS  += -I$(LIBAIO_DIR) -I$(XEN_LIBXC)
++tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := -laio
++tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS  += -I$(XEN_LIBXC)
+ 
+ ifeq ($(VHD_STATIC),y)
+ td-util: CFLAGS += -static

Added: trunk/xen/debian/patches/tools-blktap2-optimize.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-blktap2-optimize.diff	Wed Mar  9 14:19:54 2011	(r825)
@@ -0,0 +1,10 @@
+--- a/tools/blktap2/drivers/Makefile
++++ b/tools/blktap2/drivers/Makefile
+@@ -9,7 +9,6 @@
+ LOCK_UTIL  = lock-util
+ INST_DIR   = $(SBINDIR)
+ 
+-CFLAGS    += -Werror -g -O0
+ CFLAGS    += -Wno-unused
+ CFLAGS    += -fno-strict-aliasing
+ CFLAGS    += -I../lib -I../../libxc

Modified: trunk/xen/debian/patches/tools-blktap2-prefix.diff
==============================================================================
--- trunk/xen/debian/patches/tools-blktap2-prefix.diff	Wed Mar  9 14:17:13 2011	(r824)
+++ trunk/xen/debian/patches/tools-blktap2-prefix.diff	Wed Mar  9 14:19:54 2011	(r825)
@@ -42,7 +42,7 @@
  ifeq ($(CONFIG_Linux),y)
  LIBS            := -luuid
  endif
-+LDFLAGS += $(LDFLAGS_libxenctrl)
++LDFLAGS += $(LDFLAGS_libxenctrl) $(call LDFLAGS_RPATH)
  
  # Get gcc to generate the dependencies for us.
  CFLAGS          += -Wp,-MD,.$(@F).d



More information about the Pkg-xen-changes mailing list