[Pkg-xen-changes] r413 - trunk/xen-3/debian/patches

[Bastian Blank]

Author: waldi
Date: Thu Aug  2 11:55:51 2007
New Revision: 413

Log:
* debian/patches/tools-lib-abiname.diff: Also change libblktap.
* debian/patches/tools-prefix.diff: Update.


Modified:
   trunk/xen-3/debian/patches/tools-lib-abiname.diff
   trunk/xen-3/debian/patches/tools-prefix.diff

Modified: trunk/xen-3/debian/patches/tools-lib-abiname.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-lib-abiname.diff	(original)
+++ trunk/xen-3/debian/patches/tools-lib-abiname.diff	Thu Aug  2 11:55:51 2007
@@ -112,3 +112,39 @@
  	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
  	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
  	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
+--- xen-3.orig/tools/blktap/lib/Makefile
++++ xen-3/tools/blktap/lib/Makefile
+@@ -1,9 +1,7 @@
+ XEN_ROOT = ../../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
+-MAJOR    = 3.0
+-MINOR    = 0
+-SONAME   = libblktap.so.$(MAJOR)
++SONAME   = libblktap.so
+ 
+ BLKTAP_INSTALL_DIR = /usr/$(BINDIR)
+ 
+@@ -28,7 +26,7 @@
+ OBJS     = $(patsubst %.c,%.o,$(SRCS))
+ IBINS   :=
+ 
+-LIB      = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
++LIB      = libblktap.a libblktap.so
+ 
+ .PHONY: all
+ all: build
+@@ -51,11 +49,9 @@
+ 	rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
+ 
+ libblktap.a: $(OBJS) 
+-	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
++	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
+ 	      -L$(XEN_XENSTORE) -l xenstore                                \
+-	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
+-	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

Modified: trunk/xen-3/debian/patches/tools-prefix.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-prefix.diff	(original)
+++ trunk/xen-3/debian/patches/tools-prefix.diff	Thu Aug  2 11:55:51 2007
@@ -232,7 +232,18 @@
  # It belongs in /usr/lib, not /usr/lib64.
  TARGET      := hvmloader/hvmloader
 -INST_DIR := $(DESTDIR)/usr/lib/xen/boot
-+INST_DIR := $(DESTDIR)/usr/$(LIBDIR)/boot
++INST_DIR := $(DESTDIR)/usr/$(PREFIX)/boot
  
  SUBDIRS :=
  SUBDIRS += rombios rombios/32bit
+--- xen-3.orig/tools/blktap/lib/Makefile
++++ xen-3/tools/blktap/lib/Makefile
+@@ -5,7 +5,7 @@
+ MINOR    = 0
+ SONAME   = libblktap.so.$(MAJOR)
+ 
+-BLKTAP_INSTALL_DIR = /usr/sbin
++BLKTAP_INSTALL_DIR = /usr/$(BINDIR)
+ 
+ INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
+