Author: waldi
Date: 2006-03-09 20:42:10 +0000 (Thu, 09 Mar 2006)
New Revision: 94
Modified:
trunk/xen-3.0/debian/patches/libdir.dpatch
Log:
debian/patches/libdir.dpatch
- Install binary into /usr/lib/xen-3.0/bin.
- Fix rpath setting for python modules.
Modified: trunk/xen-3.0/debian/patches/libdir.dpatch
==================================================================---
trunk/xen-3.0/debian/patches/libdir.dpatch 2006-03-09 19:57:55 UTC (rev 93)
+++ trunk/xen-3.0/debian/patches/libdir.dpatch 2006-03-09 20:42:10 UTC (rev 94)
@@ -7,8 +7,8 @@
@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 20:45:55.400115561 +0100
-@@ -27,11 +27,7 @@
++++ xen-3.0/Config.mk 2006-03-09 21:36:11.144870490 +0100
+@@ -27,11 +27,8 @@
INSTALL_DATA = $(INSTALL) -m0644
INSTALL_PROG = $(INSTALL) -m0755
@@ -18,12 +18,13 @@
-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 20:45:55.400115561 +0100
++++ xen-3.0/tools/Rules.mk 2006-03-09 21:35:33.226116761 +0100
@@ -20,6 +20,9 @@
LDFLAGS += -m64
endif
@@ -36,7 +37,16 @@
%.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 20:45:55.401115422 +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
@@ -23,11 +23,11 @@
$(RM) client/*.o daemon/*.o
@@ -53,7 +63,16 @@
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 20:52:33.980969681
+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)
@@ -188,7 +188,7 @@
#########################################################
@@ -65,7 +84,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 20:45:55.401115422 +0100
++++ xen-3.0/tools/libxc/Makefile 2006-03-09 21:35:33.227116622 +0100
@@ -4,9 +4,6 @@
INSTALL_DATA = $(INSTALL) -m0644
INSTALL_DIR = $(INSTALL) -d -m0755
@@ -98,7 +117,7 @@
- $(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)
$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
@@ -141,7 +160,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 20:45:55.402115284 +0100
++++ xen-3.0/tools/misc/Makefile 2006-03-09 21:35:33.227116622 +0100
@@ -50,4 +50,4 @@
$(CC) -c $(CFLAGS) -o $@ $<
@@ -150,7 +169,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 20:45:55.402115284 +0100
++++ xen-3.0/tools/misc/cpuperf/Makefile 2006-03-09 21:35:33.227116622 +0100
@@ -37,7 +37,7 @@
$(CC) $(CFLAGS) -o $@ $<
@@ -160,35 +179,18 @@
cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
$(CC) $(CFLAGS) -DPERFCNTR -o $@ $<
-diff -urNad xen-3.0~/tools/python/Makefile xen-3.0/tools/python/Makefile
---- xen-3.0~/tools/python/Makefile 2006-02-23 22:07:48.000000000 +0100
-+++ xen-3.0/tools/python/Makefile 2006-03-09 20:45:55.402115284 +0100
-@@ -5,7 +5,7 @@
-
- all: build
- build:
-- CFLAGS="$(CFLAGS)" python setup.py build
-+ CFLAGS="$(CFLAGS)" python setup.py build $(RPATH_ARG)
-
- ifndef XEN_PYTHON_NATIVE_INSTALL
- install: all
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 20:45:55.402115284 +0100
-@@ -1,10 +1,12 @@
-
-+import sys
- from distutils.core import setup, Extension
- import os
-
++++ xen-3.0/tools/python/setup.py 2006-03-09 21:35:33.227116622 +0100
+@@ -5,6 +5,7 @@
XEN_ROOT = "../.."
extra_compile_args = [ "-fno-strict-aliasing", "-Wall",
"-Werror" ]
-+extra_link_args = [ sys.argv.pop() ]
++extra_link_args = [ "-Wl,-rpath,/usr/lib/xen-3.0" ]
include_dirs = [ XEN_ROOT + "/tools/libxc",
-@@ -19,6 +21,7 @@
+@@ -19,6 +20,7 @@
xc = Extension("xc",
extra_compile_args = extra_compile_args,
@@ -196,7 +198,7 @@
include_dirs = include_dirs + [
"xen/lowlevel/xc" ],
library_dirs = library_dirs,
libraries = libraries,
-@@ -26,6 +29,7 @@
+@@ -26,6 +28,7 @@
xs = Extension("xs",
extra_compile_args = extra_compile_args,
@@ -204,9 +206,39 @@
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
+
+-PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
++PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/bin
+
+ INCLUDES += -I $(XEN_LIBXC)
+
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 20:45:55.402115284 +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
+
@@ -48,4 +48,4 @@
$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)