Author: ultrotter
Date: 2006-04-06 13:18:32 +0000 (Thu, 06 Apr 2006)
New Revision: 157
Modified:
trunk/xen-3.0/debian/patches/libdir.dpatch
Log:
Forward port libdir.dpatch
Modified: trunk/xen-3.0/debian/patches/libdir.dpatch
==================================================================---
trunk/xen-3.0/debian/patches/libdir.dpatch 2006-04-06 12:41:29 UTC (rev 156)
+++ trunk/xen-3.0/debian/patches/libdir.dpatch 2006-04-06 13:18:32 UTC (rev 157)
@@ -1,16 +1,17 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## libdir.dpatch by Bastian Blank <waldi@debian.org>
+## Forward ported to xen 3.0.2 by Guido Trotter <ultrotter@debian.org>
##
## All lines beginning with `## DP:'' are a description of the patch.
## DP: No description.
@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 22:22:41.100864551 +0100
-@@ -27,11 +27,7 @@
- INSTALL_DATA = $(INSTALL) -m0644
- INSTALL_PROG = $(INSTALL) -m0755
+diff -urNad xen-3.0-3.0.2+hg9583/Config.mk
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/Config.mk
+--- xen-3.0-3.0.2+hg9583/Config.mk 2006-04-06 14:50:25.617893304 +0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/Config.mk 2006-04-06
14:52:25.000000000 +0200
+@@ -46,11 +46,7 @@
+ CFLAGS += -m64
+ endif
-ifeq ($(XEN_TARGET_ARCH),x86_64)
-LIBDIR = lib64
@@ -20,22 +21,9 @@
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 22:22:41.100864551 +0100
-@@ -20,6 +20,9 @@
- LDFLAGS += -m64
- endif
-
-+RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR)/xen
-+LDFLAGS += $(RPATH_ARG)
-+
- X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
-
- %.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 22:22:41.100864551 +0100
+diff -urNad xen-3.0-3.0.2+hg9583/tools/console/Makefile
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/console/Makefile
+--- xen-3.0-3.0.2+hg9583/tools/console/Makefile 2006-04-06 14:50:25.618893152
+0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/console/Makefile 2006-04-06
14:56:43.000000000 +0200
@@ -23,11 +23,11 @@
$(RM) client/*.o daemon/*.o
@@ -50,10 +38,10 @@
-lxenctrl -lxenstore
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 22:22:41.100864551
+0100
-@@ -188,7 +188,7 @@
+diff -urNad xen-3.0-3.0.2+hg9583/tools/ioemu/target-i386-dm/Makefile
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/ioemu/target-i386-dm/Makefile
+--- xen-3.0-3.0.2+hg9583/tools/ioemu/target-i386-dm/Makefile 2006-04-06
14:50:25.619893000 +0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/ioemu/target-i386-dm/Makefile
2006-04-06 14:57:52.000000000 +0200
+@@ -195,7 +195,7 @@
#########################################################
DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -62,9 +50,9 @@
ifndef CONFIG_USER_ONLY
LIBS+=-lz
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 22:23:17.559820251 +0100
+diff -urNad xen-3.0-3.0.2+hg9583/tools/libxc/Makefile
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/libxc/Makefile
+--- xen-3.0-3.0.2+hg9583/tools/libxc/Makefile 2006-04-06 14:50:25.620892848
+0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/libxc/Makefile 2006-04-06
15:09:25.000000000 +0200
@@ -4,9 +4,6 @@
INSTALL_DATA = $(INSTALL) -m0644
INSTALL_DIR = $(INSTALL) -d -m0755
@@ -72,10 +60,10 @@
-MAJOR = 3.0
-MINOR = 0
-
- CC = gcc
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
- XEN_ROOT = ../..
-@@ -69,11 +66,9 @@
+@@ -61,11 +58,9 @@
LIB_BUILD_OBJS := $(patsubst %.c,%.o,$(BUILD_SRCS))
PIC_BUILD_OBJS := $(patsubst %.c,%.opic,$(BUILD_SRCS))
@@ -89,7 +77,7 @@
all: build
build: check-for-zlib mk-symlinks
-@@ -88,18 +83,12 @@
+@@ -80,18 +75,12 @@
fi
install: build
@@ -111,7 +99,7 @@
$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
.PHONY: TAGS clean rpm install all
-@@ -124,25 +113,15 @@
+@@ -116,25 +105,15 @@
libxenctrl.a: $(LIB_OBJS)
$(AR) rc $@ $^
@@ -141,19 +129,10 @@
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so -shared -o $@ $^
-lz -lxenctrl
-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 22:22:41.101864413 +0100
-@@ -50,4 +50,4 @@
- $(CC) -c $(CFLAGS) -o $@ $<
-
- $(TARGETS): %: %.o Makefile
-- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+ $(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 22:22:41.101864413 +0100
-@@ -37,7 +37,7 @@
+diff -urNad xen-3.0-3.0.2+hg9583/tools/misc/cpuperf/Makefile
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/misc/cpuperf/Makefile
+--- xen-3.0-3.0.2+hg9583/tools/misc/cpuperf/Makefile 2006-04-06
14:50:25.622892544 +0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/misc/cpuperf/Makefile
2006-04-06 15:11:15.000000000 +0200
+@@ -35,7 +35,7 @@
$(CC) $(CFLAGS) -o $@ $<
cpuperf-xen: cpuperf.c $(HDRS) Makefile
@@ -162,51 +141,62 @@
cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
$(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 22:22:41.101864413 +0100
-@@ -5,6 +5,7 @@
+diff -urNad xen-3.0-3.0.2+hg9583/tools/misc/Makefile
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/misc/Makefile
+--- xen-3.0-3.0.2+hg9583/tools/misc/Makefile 2006-04-06 14:50:25.622892544
+0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/misc/Makefile 2006-04-06
15:10:28.000000000 +0200
+@@ -50,4 +50,4 @@
+ $(CC) -c $(CFLAGS) -o $@ $<
+
+ $(TARGETS): %: %.o Makefile
+- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
+diff -urNad xen-3.0-3.0.2+hg9583/tools/python/setup.py
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/python/setup.py
+--- xen-3.0-3.0.2+hg9583/tools/python/setup.py 2006-04-06 14:50:25.623892392
+0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/python/setup.py 2006-04-06
15:12:28.000000000 +0200
+@@ -5,6 +5,8 @@
XEN_ROOT = "../.."
extra_compile_args = [ "-fno-strict-aliasing", "-Wall",
"-Werror" ]
+extra_link_args = [ "-Wl,-rpath,/usr/lib/xen" ]
++
include_dirs = [ XEN_ROOT + "/tools/libxc",
-@@ -19,6 +20,7 @@
+@@ -19,6 +21,7 @@
xc = Extension("xc",
extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
++ extra_link_args = extra_link_args,
include_dirs = include_dirs + [
"xen/lowlevel/xc" ],
library_dirs = library_dirs,
libraries = libraries,
-@@ -26,6 +28,7 @@
+@@ -26,6 +29,7 @@
xs = Extension("xs",
extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
++ extra_link_args = extra_link_args,
include_dirs = include_dirs + [
"xen/lowlevel/xs" ],
library_dirs = library_dirs,
libraries = libraries,
-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 @@
+diff -urNad xen-3.0-3.0.2+hg9583/tools/python/xen/util/auxbin.py
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/python/xen/util/auxbin.py
+--- xen-3.0-3.0.2+hg9583/tools/python/xen/util/auxbin.py 2006-04-06
14:50:25.624892240 +0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/python/xen/util/auxbin.py
2006-04-06 15:13:38.000000000 +0200
+@@ -15,34 +15,16 @@
+ # Copyright (C) 2005 XenSource Ltd
#===========================================================================
-
+-
-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 @@
+ import os.path
def execute(exe, args = None):
@@ -217,7 +207,7 @@
a.extend(args)
os.execv(exepath, a)
-
+-
-def pathTo(exe):
- return os.path.join(path(), exe)
-
@@ -228,12 +218,25 @@
- 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
+diff -urNad xen-3.0-3.0.2+hg9583/tools/Rules.mk
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/Rules.mk
+--- xen-3.0-3.0.2+hg9583/tools/Rules.mk 2006-04-06 14:50:25.618893152 +0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/Rules.mk 2006-04-06
15:17:19.000000000 +0200
+@@ -10,6 +10,9 @@
+ XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
+ XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
+
++RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR)/xen
++LDFLAGS += $(RPATH_ARG)
++
+ X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
+
+ CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030101
+diff -urNad xen-3.0-3.0.2+hg9583/tools/xenstore/Makefile
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/xenstore/Makefile
+--- xen-3.0-3.0.2+hg9583/tools/xenstore/Makefile 2006-04-06 14:50:25.625892088
+0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/xenstore/Makefile 2006-04-06
15:15:32.000000000 +0200
+@@ -146,8 +146,8 @@
$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
+ $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
- $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
@@ -242,9 +245,9 @@
$(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 22:22:41.102864274 +0100
+diff -urNad xen-3.0-3.0.2+hg9583/tools/xentrace/Makefile
/tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/xentrace/Makefile
+--- xen-3.0-3.0.2+hg9583/tools/xentrace/Makefile 2006-04-06 14:50:25.626891936
+0200
++++ /tmp/dpep.hX1OV7/xen-3.0-3.0.2+hg9583/tools/xentrace/Makefile 2006-04-06
15:16:07.000000000 +0200
@@ -48,4 +48,4 @@
$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)