Bastian Blank
2006-Jul-05 19:17 UTC
[Pkg-xen-changes] r208 - in trunk/xen-unstable/debian: .
Author: waldi
Date: Wed Jul 5 19:16:55 2006
New Revision: 208
Modified:
trunk/xen-unstable/debian/changelog
trunk/xen-unstable/debian/patches/libdir.dpatch
Log:
* debian/changelog: Update version to hg10646-1.
* debian/patches/libdir.dpatch: Update.
Modified: trunk/xen-unstable/debian/changelog
=============================================================================---
trunk/xen-unstable/debian/changelog (original)
+++ trunk/xen-unstable/debian/changelog Wed Jul 5 19:16:55 2006
@@ -1,4 +1,4 @@
-xen-unstable (hg9211-1) UNRELEASED; urgency=low
+xen-unstable (hg10646-1) UNRELEASED; urgency=low
* Initial release.
Modified: trunk/xen-unstable/debian/patches/libdir.dpatch
=============================================================================---
trunk/xen-unstable/debian/patches/libdir.dpatch (original)
+++ trunk/xen-unstable/debian/patches/libdir.dpatch Wed Jul 5 19:16:55 2006
@@ -5,25 +5,10 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/Config.mk xen-unstable/Config.mk
---- xen-unstable~/Config.mk 2006-03-11 16:54:33.000000000 +0100
-+++ xen-unstable/Config.mk 2006-03-11 17:18:57.685333810 +0100
-@@ -46,11 +46,7 @@
- CFLAGS += -m64
- endif
-
--ifeq ($(XEN_TARGET_ARCH),x86_64)
--LIBDIR = lib64
--else
- LIBDIR = lib
--endif
-
- ifneq ($(EXTRA_PREFIX),)
- EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
diff -urNad xen-unstable~/tools/Rules.mk xen-unstable/tools/Rules.mk
---- xen-unstable~/tools/Rules.mk 2006-03-11 16:54:34.000000000 +0100
-+++ xen-unstable/tools/Rules.mk 2006-03-11 17:18:57.685333810 +0100
-@@ -10,6 +10,9 @@
+--- xen-unstable~/tools/Rules.mk 2006-07-05 21:04:43.000000000 +0200
++++ xen-unstable/tools/Rules.mk 2006-07-05 21:12:16.000000000 +0200
+@@ -12,6 +12,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -32,11 +17,11 @@
+
X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
- %.opic: %.c
+ CFLAGS += -D__XEN_TOOLS__
diff -urNad xen-unstable~/tools/console/Makefile
xen-unstable/tools/console/Makefile
---- xen-unstable~/tools/console/Makefile 2006-03-11 16:54:34.000000000 +0100
-+++ xen-unstable/tools/console/Makefile 2006-03-11 17:18:57.685333810 +0100
-@@ -23,11 +23,11 @@
+--- xen-unstable~/tools/console/Makefile 2006-07-05 21:04:43.000000000 +0200
++++ xen-unstable/tools/console/Makefile 2006-07-05 21:12:16.000000000 +0200
+@@ -25,11 +25,11 @@
$(RM) client/*.o daemon/*.o
xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
@@ -49,11 +34,11 @@
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
-lxenctrl -lxenstore
- install: $(BIN)
+ .PHONY: install
diff -urNad xen-unstable~/tools/ioemu/target-i386-dm/Makefile
xen-unstable/tools/ioemu/target-i386-dm/Makefile
---- xen-unstable~/tools/ioemu/target-i386-dm/Makefile 2006-03-11
16:54:35.000000000 +0100
-+++ xen-unstable/tools/ioemu/target-i386-dm/Makefile 2006-03-11
17:18:57.686333671 +0100
-@@ -188,7 +188,7 @@
+--- xen-unstable~/tools/ioemu/target-i386-dm/Makefile 2006-07-05
21:04:43.000000000 +0200
++++ xen-unstable/tools/ioemu/target-i386-dm/Makefile 2006-07-05
21:12:16.000000000 +0200
+@@ -195,7 +195,7 @@
#########################################################
DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -63,8 +48,8 @@
LIBS+=-lz
endif
diff -urNad xen-unstable~/tools/libxc/Makefile
xen-unstable/tools/libxc/Makefile
---- xen-unstable~/tools/libxc/Makefile 2006-03-11 16:54:35.000000000 +0100
-+++ xen-unstable/tools/libxc/Makefile 2006-03-11 17:19:07.711946572 +0100
+--- xen-unstable~/tools/libxc/Makefile 2006-07-05 21:04:43.000000000 +0200
++++ xen-unstable/tools/libxc/Makefile 2006-07-05 21:13:13.000000000 +0200
@@ -4,9 +4,6 @@
INSTALL_DATA = $(INSTALL) -m0644
INSTALL_DIR = $(INSTALL) -d -m0755
@@ -75,9 +60,9 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-@@ -65,11 +62,9 @@
- LIB_BUILD_OBJS := $(patsubst %.c,%.o,$(BUILD_SRCS))
- PIC_BUILD_OBJS := $(patsubst %.c,%.opic,$(BUILD_SRCS))
+@@ -53,11 +50,9 @@
+ GUEST_LIB_OBJS := $(patsubst %.c,%.o,$(GUEST_SRCS-y))
+ GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
-LIB := libxenctrl.a
-LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
@@ -87,11 +72,11 @@
-LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
+LIB += libxenguest.so
+ .PHONY: all
all: build
- build: check-for-zlib mk-symlinks
-@@ -84,18 +79,12 @@
- fi
+@@ -77,18 +72,12 @@
+ .PHONY: install
install: build
- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+ [ -d $(DESTDIR)/usr/$(LIBDIR)/xen ] || $(INSTALL_DIR)
$(DESTDIR)/usr/$(LIBDIR)/xen
@@ -110,9 +95,9 @@
+ $(INSTALL_PROG) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)/xen
$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
- .PHONY: TAGS clean rpm install all
-@@ -120,25 +109,15 @@
- libxenctrl.a: $(LIB_OBJS)
+ .PHONY: TAGS
+@@ -114,25 +103,15 @@
+ libxenctrl.a: $(CTRL_LIB_OBJS)
$(AR) rc $@ $^
-libxenctrl.so: libxenctrl.so.$(MAJOR)
@@ -120,14 +105,14 @@
-libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
- ln -sf $< $@
-
--libxenctrl.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctrl.so.$(MAJOR) -shared -o
$@ $^
-+libxenctrl.so: $(PIC_OBJS)
++libxenctrl.so: $(CTRL_PIC_OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctrl.so -shared -o $@ $^
# libxenguest
- libxenguest.a: $(LIB_BUILD_OBJS)
+ libxenguest.a: $(GUEST_LIB_OBJS)
$(AR) rc $@ $^
-libxenguest.so: libxenguest.so.$(MAJOR)
@@ -135,25 +120,25 @@
-libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
- ln -sf $< $@
-
--libxenguest.so.$(MAJOR).$(MINOR): $(PIC_BUILD_OBJS) libxenctrl.so
+-libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so.$(MAJOR) -shared -o
$@ $^ -lz -lxenctrl
-+libxenguest.so: $(PIC_BUILD_OBJS) libxenctrl.so
++libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so -shared -o $@ $^
-lz -lxenctrl
-include $(DEPS)
diff -urNad xen-unstable~/tools/misc/Makefile xen-unstable/tools/misc/Makefile
---- xen-unstable~/tools/misc/Makefile 2006-03-11 16:54:35.000000000 +0100
-+++ xen-unstable/tools/misc/Makefile 2006-03-11 17:18:57.686333671 +0100
-@@ -50,4 +50,4 @@
+--- xen-unstable~/tools/misc/Makefile 2006-07-05 21:04:43.000000000 +0200
++++ xen-unstable/tools/misc/Makefile 2006-07-05 21:12:16.000000000 +0200
+@@ -55,4 +55,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-unstable~/tools/misc/cpuperf/Makefile
xen-unstable/tools/misc/cpuperf/Makefile
---- xen-unstable~/tools/misc/cpuperf/Makefile 2006-03-11 16:54:35.000000000
+0100
-+++ xen-unstable/tools/misc/cpuperf/Makefile 2006-03-11 17:18:57.687333533
+0100
-@@ -35,7 +35,7 @@
+--- xen-unstable~/tools/misc/cpuperf/Makefile 2006-07-05 21:04:43.000000000
+0200
++++ xen-unstable/tools/misc/cpuperf/Makefile 2006-07-05 21:12:16.000000000
+0200
+@@ -37,7 +37,7 @@
$(CC) $(CFLAGS) -o $@ $<
cpuperf-xen: cpuperf.c $(HDRS) Makefile
@@ -163,8 +148,8 @@
cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
$(CC) $(CFLAGS) -DPERFCNTR -o $@ $<
diff -urNad xen-unstable~/tools/python/setup.py
xen-unstable/tools/python/setup.py
---- xen-unstable~/tools/python/setup.py 2006-03-11 16:54:35.000000000 +0100
-+++ xen-unstable/tools/python/setup.py 2006-03-11 17:18:57.687333533 +0100
+--- xen-unstable~/tools/python/setup.py 2006-07-05 21:04:43.000000000 +0200
++++ xen-unstable/tools/python/setup.py 2006-07-05 21:12:16.000000000 +0200
@@ -5,6 +5,7 @@
XEN_ROOT = "../.."
@@ -190,48 +175,37 @@
library_dirs = library_dirs,
libraries = libraries,
diff -urNad xen-unstable~/tools/python/xen/util/auxbin.py
xen-unstable/tools/python/xen/util/auxbin.py
---- xen-unstable~/tools/python/xen/util/auxbin.py 2006-03-11 16:54:35.000000000
+0100
-+++ xen-unstable/tools/python/xen/util/auxbin.py 2006-03-11 17:18:57.687333533
+0100
-@@ -16,12 +16,7 @@
+--- xen-unstable~/tools/python/xen/util/auxbin.py 2006-07-05 21:04:43.000000000
+0200
++++ xen-unstable/tools/python/xen/util/auxbin.py 2006-07-05 21:15:43.000000000
+0200
+@@ -16,13 +16,9 @@
#===========================================================================
--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
+-LIB_32 = "/usr/lib"
+-LIB_64 = "/usr/lib64"
++LIB = "/usr/lib"
+ LIB_BIN_SUFFIX = "xen/bin"
+
+-## The architectures on which the LIB_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 @@
+@@ -46,8 +42,4 @@
- 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():
+ def libpath():
- machine = os.uname()[4]
-- if machine in LIB_64_ARCHS and os.path.exists(LIB_BIN_64):
-- return LIB_BIN_64
+- if machine in LIB_64_ARCHS and os.path.exists(LIB_64):
+- return LIB_64
- else:
-- return LIB_BIN_32
+- return LIB_32
++ return LIB
diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
---- xen-unstable~/tools/xenstore/Makefile 2006-03-11 16:54:36.000000000 +0100
-+++ xen-unstable/tools/xenstore/Makefile 2006-03-11 17:18:57.687333533 +0100
-@@ -146,8 +146,8 @@
+--- xen-unstable~/tools/xenstore/Makefile 2006-07-05 21:04:43.000000000 +0200
++++ xen-unstable/tools/xenstore/Makefile 2006-07-05 21:12:16.000000000 +0200
+@@ -170,8 +170,8 @@
$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
@@ -243,9 +217,9 @@
$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
diff -urNad xen-unstable~/tools/xentrace/Makefile
xen-unstable/tools/xentrace/Makefile
---- xen-unstable~/tools/xentrace/Makefile 2006-03-11 16:54:36.000000000 +0100
-+++ xen-unstable/tools/xentrace/Makefile 2006-03-11 17:18:57.688333395 +0100
-@@ -48,4 +48,4 @@
+--- xen-unstable~/tools/xentrace/Makefile 2006-07-05 21:04:43.000000000 +0200
++++ xen-unstable/tools/xentrace/Makefile 2006-07-05 21:12:16.000000000 +0200
+@@ -57,4 +57,4 @@
$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
%: %.c $(HDRS) Makefile