[Pkg-xen-changes] r95 - trunk/xen-3.0/debian/patches

Bastian Blank waldi at costa.debian.org
Thu Mar 9 21:29:30 UTC 2006


Author: waldi
Date: 2006-03-09 21:29:29 +0000 (Thu, 09 Mar 2006)
New Revision: 95

Modified:
   trunk/xen-3.0/debian/patches/libdir.dpatch
Log:
debian/patches/libdir.dpatch: Install anything into /usr/lib/xen.


Modified: trunk/xen-3.0/debian/patches/libdir.dpatch
===================================================================
--- trunk/xen-3.0/debian/patches/libdir.dpatch	2006-03-09 20:42:10 UTC (rev 94)
+++ trunk/xen-3.0/debian/patches/libdir.dpatch	2006-03-09 21:29:29 UTC (rev 95)
@@ -7,29 +7,27 @@
 @DPATCH@
 diff -urNad xen-3.0~/Config.mk xen-3.0/Config.mk
 --- xen-3.0~/Config.mk	2006-02-23 22:07:46.000000000 +0100
-+++ xen-3.0/Config.mk	2006-03-09 21:36:11.144870490 +0100
-@@ -27,11 +27,8 @@
++++ xen-3.0/Config.mk	2006-03-09 22:22:41.100864551 +0100
+@@ -27,11 +27,7 @@
  INSTALL_DATA = $(INSTALL) -m0644
  INSTALL_PROG = $(INSTALL) -m0755
  
 -ifeq ($(XEN_TARGET_ARCH),x86_64)
 -LIBDIR = lib64
 -else
--LIBDIR = lib
+ LIBDIR = lib
 -endif
-+LIBDIR = lib/xen-3.0
-+REAL_LIBDIR := $(LIBDIR)
  
  ifneq ($(EXTRA_PREFIX),)
  EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
 diff -urNad xen-3.0~/tools/Rules.mk xen-3.0/tools/Rules.mk
 --- xen-3.0~/tools/Rules.mk	2006-02-23 22:07:47.000000000 +0100
-+++ xen-3.0/tools/Rules.mk	2006-03-09 21:35:33.226116761 +0100
++++ xen-3.0/tools/Rules.mk	2006-03-09 22:22:41.100864551 +0100
 @@ -20,6 +20,9 @@
  LDFLAGS += -m64
  endif
  
-+RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR)
++RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR)/xen
 +LDFLAGS += $(RPATH_ARG)
 +
  X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
@@ -37,16 +35,7 @@
  %.opic: %.c
 diff -urNad xen-3.0~/tools/console/Makefile xen-3.0/tools/console/Makefile
 --- xen-3.0~/tools/console/Makefile	2006-02-23 22:07:47.000000000 +0100
-+++ xen-3.0/tools/console/Makefile	2006-03-09 21:35:33.226116761 +0100
-@@ -3,7 +3,7 @@
- include $(XEN_ROOT)/tools/Rules.mk
- 
- DAEMON_INSTALL_DIR = /usr/sbin
--CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-+CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/bin
- 
- INSTALL         = install
- INSTALL_PROG    = $(INSTALL) -m0755
++++ xen-3.0/tools/console/Makefile	2006-03-09 22:22:41.100864551 +0100
 @@ -23,11 +23,11 @@
  	$(RM) client/*.o daemon/*.o
  
@@ -63,16 +52,7 @@
  install: $(BIN)
 diff -urNad xen-3.0~/tools/ioemu/target-i386-dm/Makefile xen-3.0/tools/ioemu/target-i386-dm/Makefile
 --- xen-3.0~/tools/ioemu/target-i386-dm/Makefile	2006-02-23 22:07:48.000000000 +0100
-+++ xen-3.0/tools/ioemu/target-i386-dm/Makefile	2006-03-09 21:36:39.542941459 +0100
-@@ -3,7 +3,7 @@
- include config.mak
- override TARGET_ARCH=i386
- 
--INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
-+INSTALL_DIR := $(DESTDIR)/usr/$(REAL_LIBDIR)/bin
- TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
- VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
- DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
++++ xen-3.0/tools/ioemu/target-i386-dm/Makefile	2006-03-09 22:22:41.100864551 +0100
 @@ -188,7 +188,7 @@
  #########################################################
  
@@ -84,7 +64,7 @@
  endif
 diff -urNad xen-3.0~/tools/libxc/Makefile xen-3.0/tools/libxc/Makefile
 --- xen-3.0~/tools/libxc/Makefile	2006-02-23 22:07:48.000000000 +0100
-+++ xen-3.0/tools/libxc/Makefile	2006-03-09 21:35:33.227116622 +0100
++++ xen-3.0/tools/libxc/Makefile	2006-03-09 22:23:17.559820251 +0100
 @@ -4,9 +4,6 @@
  INSTALL_DATA	= $(INSTALL) -m0644
  INSTALL_DIR	= $(INSTALL) -d -m0755
@@ -109,22 +89,25 @@
  
  all: build
  build: check-for-zlib mk-symlinks
-@@ -90,16 +85,10 @@
+@@ -88,18 +83,12 @@
+ 	fi
+ 
  install: build
- 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+-	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
++	[ -d $(DESTDIR)/usr/$(LIBDIR)/xen ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen
  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
 -	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
 -	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
 -	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
 -	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
-+	$(INSTALL_PROG) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_PROG) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)/xen
  	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
  
 -	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
 -	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
 -	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
 -	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
-+	$(INSTALL_PROG) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_PROG) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)/xen
  	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
  
  .PHONY: TAGS clean rpm install all
@@ -160,7 +143,7 @@
  -include $(DEPS)
 diff -urNad xen-3.0~/tools/misc/Makefile xen-3.0/tools/misc/Makefile
 --- xen-3.0~/tools/misc/Makefile	2006-02-23 22:07:48.000000000 +0100
-+++ xen-3.0/tools/misc/Makefile	2006-03-09 21:35:33.227116622 +0100
++++ xen-3.0/tools/misc/Makefile	2006-03-09 22:22:41.101864413 +0100
 @@ -50,4 +50,4 @@
  	$(CC) -c $(CFLAGS) -o $@ $<
  
@@ -169,7 +152,7 @@
 +	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
 diff -urNad xen-3.0~/tools/misc/cpuperf/Makefile xen-3.0/tools/misc/cpuperf/Makefile
 --- xen-3.0~/tools/misc/cpuperf/Makefile	2006-02-23 22:07:48.000000000 +0100
-+++ xen-3.0/tools/misc/cpuperf/Makefile	2006-03-09 21:35:33.227116622 +0100
++++ xen-3.0/tools/misc/cpuperf/Makefile	2006-03-09 22:22:41.101864413 +0100
 @@ -37,7 +37,7 @@
  	$(CC) $(CFLAGS) -o $@ $<
  
@@ -181,12 +164,12 @@
  	$(CC) $(CFLAGS) -DPERFCNTR -o $@ $<
 diff -urNad xen-3.0~/tools/python/setup.py xen-3.0/tools/python/setup.py
 --- xen-3.0~/tools/python/setup.py	2006-02-23 22:07:48.000000000 +0100
-+++ xen-3.0/tools/python/setup.py	2006-03-09 21:35:33.227116622 +0100
++++ xen-3.0/tools/python/setup.py	2006-03-09 22:22:41.101864413 +0100
 @@ -5,6 +5,7 @@
  XEN_ROOT = "../.."
  
  extra_compile_args  = [ "-fno-strict-aliasing", "-Wall", "-Werror" ]
-+extra_link_args = [ "-Wl,-rpath,/usr/lib/xen-3.0" ]
++extra_link_args = [ "-Wl,-rpath,/usr/lib/xen" ]
  
  
  include_dirs = [ XEN_ROOT + "/tools/libxc",
@@ -206,39 +189,62 @@
                 include_dirs       = include_dirs + [ "xen/lowlevel/xs" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
-diff -urNad xen-3.0~/tools/xcutils/Makefile xen-3.0/tools/xcutils/Makefile
---- xen-3.0~/tools/xcutils/Makefile	2006-02-23 22:07:49.000000000 +0100
-+++ xen-3.0/tools/xcutils/Makefile	2006-03-09 21:35:33.227116622 +0100
-@@ -15,7 +15,7 @@
- XEN_ROOT	= ../..
- include $(XEN_ROOT)/tools/Rules.mk
+diff -urNad xen-3.0~/tools/python/xen/util/auxbin.py xen-3.0/tools/python/xen/util/auxbin.py
+--- xen-3.0~/tools/python/xen/util/auxbin.py	2006-02-23 22:07:48.000000000 +0100
++++ xen-3.0/tools/python/xen/util/auxbin.py	2006-03-09 22:22:41.102864274 +0100
+@@ -16,12 +16,7 @@
+ #============================================================================
  
--PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-+PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/bin
  
- INCLUDES += -I $(XEN_LIBXC)
+-LIB_BIN_32 = "/usr/lib/xen/bin"
+-LIB_BIN_64 = "/usr/lib64/xen/bin"
+-
+-## The architectures on which the LIB_BIN_64 directory is used.  This
+-# deliberately excludes ia64.
+-LIB_64_ARCHS = [ 'x86_64', 'ppc64', 's390x', 'sparc64']
++LIB_BIN = "/usr/lib/xen/bin"
  
+ 
+ import os
+@@ -29,20 +24,10 @@
+ 
+ 
+ def execute(exe, args = None):
+-    exepath = pathTo(exe)
++    exepath = os.path.join(LIB_BIN, exe)
+     a = [ exepath ]
+     if args:
+         a.extend(args)
+     os.execv(exepath, a)
+ 
+ 
+-def pathTo(exe):
+-    return os.path.join(path(), exe)
+-
+-
+-def path():
+-    machine = os.uname()[4]
+-    if machine in LIB_64_ARCHS and os.path.exists(LIB_BIN_64):
+-        return LIB_BIN_64
+-    else:
+-        return LIB_BIN_32
+diff -urNad xen-3.0~/tools/xenstore/Makefile xen-3.0/tools/xenstore/Makefile
+--- xen-3.0~/tools/xenstore/Makefile	2006-02-23 22:07:49.000000000 +0100
++++ xen-3.0/tools/xenstore/Makefile	2006-03-09 22:23:38.550916017 +0100
+@@ -138,8 +138,8 @@
+ 	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
+ 	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
+ 	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
+-	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+-	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/xen
++	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)/xen
+ 	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
+ 
 diff -urNad xen-3.0~/tools/xentrace/Makefile xen-3.0/tools/xentrace/Makefile
 --- xen-3.0~/tools/xentrace/Makefile	2006-02-23 22:07:49.000000000 +0100
-+++ xen-3.0/tools/xentrace/Makefile	2006-03-09 21:35:33.228116484 +0100
-@@ -33,14 +33,14 @@
- 
- install: build
- 	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
--	[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
--		$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
-+	[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/bin ] || \
-+		$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/bin
- 	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
- 		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
- 	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
- 		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
- 	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
--	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
-+	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/bin
- 	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
- 	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
- 
++++ xen-3.0/tools/xentrace/Makefile	2006-03-09 22:22:41.102864274 +0100
 @@ -48,4 +48,4 @@
  	$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
  




More information about the Pkg-xen-changes mailing list