Bastian Blank
2006-Aug-25 10:11 UTC
[Pkg-xen-changes] r280 - in trunk/xen-3.0/debian: . bin patches
Author: waldi
Date: Fri Aug 25 10:10:47 2006
New Revision: 280
Added:
trunk/xen-3.0/debian/patches/prefix-python.dpatch
- copied, changed from r276,
/trunk/xen-unstable/debian/patches/prefix-python.dpatch
trunk/xen-3.0/debian/patches/qemu-arch.dpatch
- copied, changed from r276,
/trunk/xen-unstable/debian/patches/qemu-arch.dpatch
trunk/xen-3.0/debian/templates/xen-utils.postinst.in
- copied unchanged from r276,
/trunk/xen-unstable/debian/templates/xen-utils.postinst.in
trunk/xen-3.0/debian/templates/xen-utils.prerm.in
- copied unchanged from r276,
/trunk/xen-unstable/debian/templates/xen-utils.prerm.in
Modified:
trunk/xen-3.0/debian/bin/gencontrol.py
trunk/xen-3.0/debian/patches/00list
trunk/xen-3.0/debian/patches/prefix-utils.dpatch
trunk/xen-3.0/debian/rules.real
Log:
Merge changes from xen-unstable.
Modified: trunk/xen-3.0/debian/bin/gencontrol.py
=============================================================================---
trunk/xen-3.0/debian/bin/gencontrol.py (original)
+++ trunk/xen-3.0/debian/bin/gencontrol.py Fri Aug 25 10:10:47 2006
@@ -17,6 +17,7 @@
''MAJOR'':
self.version[''xen''][''major''],
''VERSION'':
self.version[''xen''][''version''],
''SHORT_VERSION'':
self.version[''xen''][''short_version''],
+ ''EXTRAVERSION'':
self.version[''xen''][''extraversion''],
''ABINAME'': self.abiname,
})
@@ -47,6 +48,10 @@
package_utils_name = packages_utils[0][''Package'']
+ for i in (''postinst'', ''prerm''):
+ j = self.substitute(self.templates["xen-utils.%s" % i],
vars)
+ file("debian/%s.%s" % (package_utils_name, i),
''w'').write(j)
+
cmds_binary_arch = []
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real
binary-arch-arch %s" % makeflags))
cmds_build = []
@@ -120,8 +125,10 @@
(?P<version>
(?P<major>\d+\.\d+)
(
- (?P<minor>\.\d+)
- -\d+
+ (?P<extraversion>
+ (?P<minor>\.\d+)
+ -\d+
+ )
|
(?P<unstable>-unstable)
)
@@ -145,9 +152,11 @@
if ret[''unstable''] is not None:
ret[''major''] = ''unstable''
ret[''short_version''] =
ret[''version'']
+ ret[''extraversion''] =
ret[''unstable'']
else:
ret[''version''] = ret[''major''] +
ret[''minor'']
ret[''short_version''] = ret[''major'']
+ del ret[''unstable'']
return ret
if __name__ == ''__main__'':
Modified: trunk/xen-3.0/debian/patches/00list
=============================================================================---
trunk/xen-3.0/debian/patches/00list (original)
+++ trunk/xen-3.0/debian/patches/00list Fri Aug 25 10:10:47 2006
@@ -1,6 +1,7 @@
prefix-utils
prefix-ioemu
-manpages
+prefix-python
version
qemu-config
libs
+qemu-arch
Copied: trunk/xen-3.0/debian/patches/prefix-python.dpatch (from r276,
/trunk/xen-unstable/debian/patches/prefix-python.dpatch)
=============================================================================---
/trunk/xen-unstable/debian/patches/prefix-python.dpatch (original)
+++ trunk/xen-3.0/debian/patches/prefix-python.dpatch Fri Aug 25 10:10:47 2006
@@ -5,33 +5,27 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/tools/misc/xend xen-unstable/tools/misc/xend
---- xen-unstable~/tools/misc/xend 2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/xend 2006-08-22 12:18:23.600149518 +0000
-@@ -35,16 +35,7 @@
-
- AUXBIN = ''xen/util/auxbin.py''
-
--for p in [''python%s'' % sys.version[:3],
''python'']:
-- for l in [''/usr/lib64'', ''/usr/lib'']:
-- d = os.path.join(l, p)
-- if os.path.exists(os.path.join(d, AUXBIN)):
-- sys.path.append(d)
-- import xen.util.auxbin
-- libpath = xen.util.auxbin.libpath()
-- sys.path = sys.path[:-1]
-- sys.path.append(libpath)
-- break
-+sys.path.append(''%s/../lib/python'' % sys.path[0])
+diff -urNad xen-3.0~/tools/misc/xend xen-3.0/tools/misc/xend
+--- xen-3.0~/tools/misc/xend 2006-08-21 05:12:27.000000000 +0000
++++ xen-3.0/tools/misc/xend 2006-08-25 10:05:28.344316353 +0000
+@@ -27,9 +27,8 @@
+ import time
+ import commands
+-# add fallback path for non-native python path installs if needed
+-sys.path.append(''/usr/lib/python'')
+-sys.path.append(''/usr/lib64/python'')
++sys.path.append(''%s/../lib/python'' % sys.path[0])
++
from xen.xend.server import SrvDaemon
-@@ -84,18 +75,18 @@
+ class CheckError(ValueError):
+@@ -68,14 +67,14 @@
def start_xenstored():
XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
-- cmd = "xenstored --pid-file /var/run/xenstore.pid"
-+ cmd = sys.path[0] + "/xenstored --pid-file
/var/run/xenstore.pid"
+- cmd = "xenstored --pid-file=/var/run/xenstore.pid"
++ cmd = sys.path[0] + "/xenstored
--pid-file=/var/run/xenstore.pid"
if XENSTORED_TRACE:
cmd += " -T /var/log/xenstored-trace.log"
s,o = commands.getstatusoutput(cmd)
@@ -40,17 +34,12 @@
if os.fork() == 0:
- os.execvp(''xenconsoled'',
[''xenconsoled''])
+ os.execvp(sys.path[0] + ''/xenconsoled'',
[''xenconsoled''])
-
- def start_blktapctrl():
- if os.fork() == 0:
-- os.execvp(''blktapctrl'',
[''blktapctrl''])
-+ os.execvp(sys.path[0] + ''/blktapctrl'',
[''blktapctrl''])
def main():
try:
-diff -urNad xen-unstable~/tools/misc/xm xen-unstable/tools/misc/xm
---- xen-unstable~/tools/misc/xm 2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/xm 2006-08-22 12:18:23.600149518 +0000
+diff -urNad xen-3.0~/tools/misc/xm xen-3.0/tools/misc/xm
+--- xen-3.0~/tools/misc/xm 2006-08-21 05:12:27.000000000 +0000
++++ xen-3.0/tools/misc/xm 2006-08-25 10:05:28.344316353 +0000
@@ -1,10 +1,7 @@
#!/usr/bin/env python
# -*- mode: python; -*-
@@ -63,20 +52,19 @@
from xen.xm import main
main.main(sys.argv)
-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-08-22 09:56:45.000000000
+0000
-+++ xen-unstable/tools/python/xen/util/auxbin.py 2006-08-22 12:18:23.600149518
+0000
-@@ -16,17 +16,9 @@
+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-08-21 05:12:26.000000000
+0000
++++ xen-3.0/tools/python/xen/util/auxbin.py 2006-08-25 10:05:28.356310962 +0000
+@@ -16,16 +16,9 @@
#===========================================================================
--LIB_32 = "/usr/lib"
--LIB_64 = "/usr/lib64"
--LIB_BIN_SUFFIX = "xen/bin"
+-LIB_BIN_32 = "/usr/lib/xen/bin"
+-LIB_BIN_64 = "/usr/lib64/xen/bin"
-
--## The architectures on which the LIB_64 directory is used. This
--# deliberately excludes ia64 and ppc64.
--LIB_64_ARCHS = [ ''x86_64'', ''s390x'',
''sparc64'']
+-## The architectures on which the LIB_BIN_64 directory is used. This
+-# deliberately excludes ia64.
+-LIB_64_ARCHS = [ ''x86_64'', ''ppc64'',
''s390x'', ''sparc64'']
-
-
import os
@@ -85,24 +73,19 @@
def execute(exe, args = None):
-@@ -42,12 +34,8 @@
+@@ -41,8 +34,4 @@
def path():
-- return os.path.join(libpath(), LIB_BIN_SUFFIX)
-+ return sys.path[0]
-
-
- def libpath():
- machine = os.uname()[4]
-- if machine in LIB_64_ARCHS and os.path.exists(LIB_64):
-- return LIB_64
+- if machine in LIB_64_ARCHS and os.path.exists(LIB_BIN_64):
+- return LIB_BIN_64
- else:
-- return LIB_32
-+ return os.path.join(path(), ''../lib'')
-diff -urNad xen-unstable~/tools/python/xen/xm/console.py
xen-unstable/tools/python/xen/xm/console.py
---- xen-unstable~/tools/python/xen/xm/console.py 2006-08-22 09:56:45.000000000
+0000
-+++ xen-unstable/tools/python/xen/xm/console.py 2006-08-22 12:19:12.039201599
+0000
+- return LIB_BIN_32
++ return sys.path[0]
+diff -urNad xen-3.0~/tools/python/xen/xm/console.py
xen-3.0/tools/python/xen/xm/console.py
+--- xen-3.0~/tools/python/xen/xm/console.py 2006-08-21 05:12:26.000000000 +0000
++++ xen-3.0/tools/python/xen/xm/console.py 2006-08-25 10:05:28.356310962 +0000
@@ -23,4 +23,4 @@
Modified: trunk/xen-3.0/debian/patches/prefix-utils.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/prefix-utils.dpatch (original)
+++ trunk/xen-3.0/debian/patches/prefix-utils.dpatch Fri Aug 25 10:10:47 2006
@@ -7,9 +7,9 @@
@DPATCH@
diff -urNad xen-3.0~/Config.mk xen-3.0/Config.mk
---- xen-3.0~/Config.mk 2006-08-18 16:42:43.000000000 +0000
-+++ xen-3.0/Config.mk 2006-08-20 22:15:59.045465667 +0000
-@@ -47,11 +47,10 @@
+--- xen-3.0~/Config.mk 2006-08-21 05:12:20.000000000 +0000
++++ xen-3.0/Config.mk 2006-08-25 10:02:25.639982507 +0000
+@@ -47,11 +47,9 @@
CFLAGS += -m64
endif
@@ -21,13 +21,12 @@
+PREFIX = lib/xen-$(XEN_VERSION_TOOLS)
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
-+SBINDIR = $(PREFIX)/sbin
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-08-18 16:42:45.000000000 +0000
-+++ xen-3.0/tools/Rules.mk 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/Rules.mk 2006-08-21 05:12:22.000000000 +0000
++++ xen-3.0/tools/Rules.mk 2006-08-25 10:02:25.639982507 +0000
@@ -10,6 +10,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -39,20 +38,19 @@
CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030101
diff -urNad xen-3.0~/tools/console/Makefile xen-3.0/tools/console/Makefile
---- xen-3.0~/tools/console/Makefile 2006-08-18 16:42:45.000000000 +0000
-+++ xen-3.0/tools/console/Makefile 2006-08-20 22:15:59.045465667 +0000
-@@ -2,8 +2,8 @@
+--- xen-3.0~/tools/console/Makefile 2006-08-21 05:12:21.000000000 +0000
++++ xen-3.0/tools/console/Makefile 2006-08-25 10:02:25.639982507 +0000
+@@ -2,8 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-DAEMON_INSTALL_DIR = /usr/sbin
-CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-+DAEMON_INSTALL_DIR = /usr/$(SBINDIR)
-+CLIENT_INSTALL_DIR = /usr/$(BINDIR)
++DIR = /usr/$(BINDIR)
INSTALL = install
INSTALL_PROG = $(INSTALL) -m0755
-@@ -25,11 +25,11 @@
+@@ -25,11 +24,11 @@
$(RM) client/*.o daemon/*.o
xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
@@ -67,9 +65,9 @@
.PHONY: install
diff -urNad xen-3.0~/tools/misc/Makefile xen-3.0/tools/misc/Makefile
---- xen-3.0~/tools/misc/Makefile 2006-08-18 16:42:48.000000000 +0000
-+++ xen-3.0/tools/misc/Makefile 2006-08-20 22:15:59.045465667 +0000
-@@ -32,10 +32,10 @@
+--- xen-3.0~/tools/misc/Makefile 2006-08-21 05:12:27.000000000 +0000
++++ xen-3.0/tools/misc/Makefile 2006-08-25 10:02:25.639982507 +0000
+@@ -32,10 +32,9 @@
.PHONY: install
install: build
@@ -77,22 +75,21 @@
- [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
- $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
- $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
-+ $(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
-+ $(INSTALL_DIR) $(DESTDIR)/usr/$(SBINDIR)
-+ $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/$(BINDIR)
-+ $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/$(SBINDIR)
++ $(INSTALL_DIR) $(DESTDIR)/usr/$(DIR)
++ $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/$(DIR)
++ $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/$(DIR)
$(MAKE) -C cpuperf install
$(MAKE) -C lomount install
# No sense in installing miniterm on the Xen box.
-@@ -55,4 +55,4 @@
+@@ -55,4 +54,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-08-18 16:42:48.000000000 +0000
-+++ xen-3.0/tools/misc/cpuperf/Makefile 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/misc/cpuperf/Makefile 2006-08-21 05:12:27.000000000 +0000
++++ xen-3.0/tools/misc/cpuperf/Makefile 2006-08-25 10:02:25.639982507 +0000
@@ -37,14 +37,14 @@
$(CC) $(CFLAGS) -o $@ $<
@@ -111,8 +108,8 @@
# End of $RCSfile: Makefile,v $
diff -urNad xen-3.0~/tools/misc/lomount/Makefile
xen-3.0/tools/misc/lomount/Makefile
---- xen-3.0~/tools/misc/lomount/Makefile 2006-08-18 16:42:48.000000000 +0000
-+++ xen-3.0/tools/misc/lomount/Makefile 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/misc/lomount/Makefile 2006-08-21 05:12:27.000000000 +0000
++++ xen-3.0/tools/misc/lomount/Makefile 2006-08-25 10:02:25.639982507 +0000
@@ -21,7 +21,7 @@
.PHONY: install
@@ -123,8 +120,8 @@
.PHONY: clean
clean:
diff -urNad xen-3.0~/tools/pygrub/Makefile xen-3.0/tools/pygrub/Makefile
---- xen-3.0~/tools/pygrub/Makefile 2006-08-18 16:42:46.000000000 +0000
-+++ xen-3.0/tools/pygrub/Makefile 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/pygrub/Makefile 2006-08-21 05:12:24.000000000 +0000
++++ xen-3.0/tools/pygrub/Makefile 2006-08-25 10:02:25.639982507 +0000
@@ -11,7 +11,7 @@
.PHONY: install
ifndef XEN_PYTHON_NATIVE_INSTALL
@@ -135,8 +132,8 @@
install: all
CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)"
diff -urNad xen-3.0~/tools/python/Makefile xen-3.0/tools/python/Makefile
---- xen-3.0~/tools/python/Makefile 2006-08-18 16:42:46.000000000 +0000
-+++ xen-3.0/tools/python/Makefile 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/python/Makefile 2006-08-21 05:12:25.000000000 +0000
++++ xen-3.0/tools/python/Makefile 2006-08-25 10:02:25.639982507 +0000
@@ -6,15 +6,15 @@
.PHONY: build
@@ -157,8 +154,8 @@
.PHONY: test
diff -urNad xen-3.0~/tools/python/setup.py xen-3.0/tools/python/setup.py
---- xen-3.0~/tools/python/setup.py 2006-08-18 16:42:46.000000000 +0000
-+++ xen-3.0/tools/python/setup.py 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/python/setup.py 2006-08-21 05:12:25.000000000 +0000
++++ xen-3.0/tools/python/setup.py 2006-08-25 10:02:25.639982507 +0000
@@ -5,6 +5,8 @@
XEN_ROOT = "../.."
@@ -185,8 +182,8 @@
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-08-18 16:42:49.000000000 +0000
-+++ xen-3.0/tools/xcutils/Makefile 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/xcutils/Makefile 2006-08-21 05:12:28.000000000 +0000
++++ xen-3.0/tools/xcutils/Makefile 2006-08-25 10:02:25.639982507 +0000
@@ -15,7 +15,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -197,8 +194,8 @@
INCLUDES += -I $(XEN_LIBXC)
diff -urNad xen-3.0~/tools/xenmon/Makefile xen-3.0/tools/xenmon/Makefile
---- xen-3.0~/tools/xenmon/Makefile 2006-08-18 16:42:47.000000000 +0000
-+++ xen-3.0/tools/xenmon/Makefile 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/xenmon/Makefile 2006-08-21 05:12:26.000000000 +0000
++++ xen-3.0/tools/xenmon/Makefile 2006-08-25 10:02:25.639982507 +0000
@@ -15,8 +15,6 @@
INSTALL_DIR = $(INSTALL) -d -m0755
INSTALL_DATA = $(INSTALL) -m0644
@@ -216,43 +213,50 @@
- $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
- $(INSTALL_PROG) setmask $(DESTDIR)$(sbindir)/setmask
- $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py
-+ $(INSTALL_DIR) $(DESTDIR)/usr/$(SBINDIR)
-+ $(INSTALL_PROG) xenbaked $(DESTDIR)/usr/$(SBINDIR)/xenbaked
-+ $(INSTALL_PROG) setmask $(DESTDIR)/usr/$(SBINDIR)/setmask
-+ $(INSTALL_PROG) xenmon.py $(DESTDIR)/usr/$(SBINDIR)/xenmon.py
++ $(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
++ $(INSTALL_PROG) xenbaked $(DESTDIR)/usr/$(BINDIR)/xenbaked
++ $(INSTALL_PROG) setmask $(DESTDIR)/usr/$(BINDIR)/setmask
++ $(INSTALL_PROG) xenmon.py $(DESTDIR)/usr/$(BINDIR)/xenmon.py
.PHONY: clean
clean:
diff -urNad xen-3.0~/tools/xenstat/xentop/Makefile
xen-3.0/tools/xenstat/xentop/Makefile
---- xen-3.0~/tools/xenstat/xentop/Makefile 2006-08-18 16:42:49.000000000 +0000
-+++ xen-3.0/tools/xenstat/xentop/Makefile 2006-08-20 22:15:59.045465667 +0000
-@@ -25,7 +25,7 @@
+--- xen-3.0~/tools/xenstat/xentop/Makefile 2006-08-21 05:12:28.000000000 +0000
++++ xen-3.0/tools/xenstat/xentop/Makefile 2006-08-25 10:02:51.544340554 +0000
+@@ -25,7 +25,6 @@
prefix=/usr
mandir=$(prefix)/share/man
man1dir=$(mandir)/man1
-sbindir=$(prefix)/sbin
-+sbindir=$(prefix)/$(SBINDIR)
CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
LDFLAGS += -L$(XEN_LIBXENSTAT)
+@@ -36,7 +35,7 @@
+
+ .PHONY: install
+ install: xentop xentop.1
+- $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
++ $(INSTALL_PROG) xentop $(DESTDIR)/usr/$(BINDIR)/xentop
+ $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
+
+ endif
diff -urNad xen-3.0~/tools/xenstore/Makefile xen-3.0/tools/xenstore/Makefile
---- xen-3.0~/tools/xenstore/Makefile 2006-08-18 16:42:45.000000000 +0000
-+++ xen-3.0/tools/xenstore/Makefile 2006-08-20 22:15:59.045465667 +0000
-@@ -157,14 +157,14 @@
+--- xen-3.0~/tools/xenstore/Makefile 2006-08-21 05:12:23.000000000 +0000
++++ xen-3.0/tools/xenstore/Makefile 2006-08-25 10:02:25.639982507 +0000
+@@ -157,14 +157,13 @@
install: all
$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
- $(INSTALL_DIR) -p $(DESTDIR)/usr/bin
- $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
+ $(INSTALL_DIR) -p $(DESTDIR)/usr/$(BINDIR)
-+ $(INSTALL_DIR) -p $(DESTDIR)/usr/$(SBINDIR)
$(INSTALL_DIR) -p $(DESTDIR)/usr/include
- $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
- $(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_PROG) xenstored $(DESTDIR)/usr/$(SBINDIR)
++ $(INSTALL_PROG) xenstored $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
@@ -261,8 +265,8 @@
$(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-08-18 16:42:46.000000000 +0000
-+++ xen-3.0/tools/xentrace/Makefile 2006-08-20 22:15:59.045465667 +0000
+--- xen-3.0~/tools/xentrace/Makefile 2006-08-21 05:12:25.000000000 +0000
++++ xen-3.0/tools/xentrace/Makefile 2006-08-25 10:02:25.639982507 +0000
@@ -15,17 +15,16 @@
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
Copied: trunk/xen-3.0/debian/patches/qemu-arch.dpatch (from r276,
/trunk/xen-unstable/debian/patches/qemu-arch.dpatch)
=============================================================================---
/trunk/xen-unstable/debian/patches/qemu-arch.dpatch (original)
+++ trunk/xen-3.0/debian/patches/qemu-arch.dpatch Fri Aug 25 10:10:47 2006
@@ -5,40 +5,41 @@
## DP: No description.
@DPATCH@
-diff -urNad xen-unstable~/tools/ioemu/configure
xen-unstable/tools/ioemu/configure
---- xen-unstable~/tools/ioemu/configure 2006-08-18 15:35:45.000000000 +0000
-+++ xen-unstable/tools/ioemu/configure 2006-08-18 16:19:34.759859866 +0000
-@@ -27,46 +27,18 @@
+diff -urNad xen-3.0~/tools/ioemu/configure xen-3.0/tools/ioemu/configure
+--- xen-3.0~/tools/ioemu/configure 2006-08-25 10:06:53.814716843 +0000
++++ xen-3.0/tools/ioemu/configure 2006-08-25 10:06:54.166558718 +0000
+@@ -26,43 +26,18 @@
+ ar="ar"
make="make"
- install="install"
strip="strip"
-cpu=`uname -m`
- target_list=""
+ target_list="target-i386-dm"
-case "$cpu" in
- i386|i486|i586|i686|i86pc|BePC)
+case "$XEN_TARGET_ARCH" in
+ x86_32)
cpu="i386"
;;
-- armv*b)
-- cpu="armv4b"
-- ;;
-- armv*l)
+- armv4l)
- cpu="armv4l"
- ;;
- alpha)
- cpu="alpha"
-- ;;
++ x86_64)
++ cpu="x86_64"
++ libdir="lib64"
+ ;;
- "Power Macintosh"|ppc|ppc64)
-- cpu="powerpc"
-- ;;
++ powerpc)
+ cpu="powerpc"
+ ;;
- mips)
- cpu="mips"
- ;;
- s390)
- cpu="s390"
- ;;
-- sparc|sun4[muv])
+- sparc)
- cpu="sparc"
- ;;
- sparc64)
@@ -51,13 +52,9 @@
- cpu="m68k"
- ;;
- x86_64|amd64)
-+ x86_64)
- cpu="x86_64"
- libdir="lib64"
- ;;
-+ powerpc)
-+ cpu="powerpc"
-+ ;;
+- cpu="amd64"
+- libdir="lib64"
+- ;;
*)
cpu="unknown"
;;
Modified: trunk/xen-3.0/debian/rules.real
=============================================================================---
trunk/xen-3.0/debian/rules.real (original)
+++ trunk/xen-3.0/debian/rules.real Fri Aug 25 10:10:47 2006
@@ -33,6 +33,7 @@
$(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/source
@rm -rf $(DIR)
cp -a $(SOURCE_DIR) $(DIR)
+ echo "XEN_EXTRAVERSION := $(EXTRAVERSION)$(ABINAME)" >
$(DIR)/xen/xen-version
touch $@
$(STAMPS_DIR)/setup-utils_$(ARCH): SOURCE_DIR=$(BUILD_DIR)/source
@@ -86,7 +87,7 @@
dh_testroot
dh_clean -k
dh_installdirs boot
- cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).gz
+ cp $(DIR)/xen/xen.gz
debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)$(ABINAME)-$(FLAVOUR).gz
$(MAKE) -f debian/rules.real install-base
install-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
@@ -101,6 +102,8 @@
install -D -m644 debian/xen-utils.README.Debian
debian/$(PACKAGE_NAME_UTILS)/usr/share/doc/$(PACKAGE_NAME_UTILS)/README.Debian
$(MAKE) -C $(DIR)/tools install DESTDIR=$(CURDIR)/debian/tmp
DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH)
XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION_TOOLS=$(VERSION)$(ABINAME)
XEN_VERSION_IOEMU=$(SHORT_VERSION)
DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp
usr/lib/xen-$(VERSION)$(ABINAME) usr/lib
+ DH_OPTIONS= dh_link -p$(PACKAGE_NAME_UTILS)
usr/lib/xen-ioemu-$(SHORT_VERSION)/bin/qemu-dm
usr/lib/xen-$(VERSION)$(ABINAME)/bin/qemu-dm
+ DH_OPTIONS= dh_link -p$(PACKAGE_NAME_UTILS)
usr/lib/xen-ioemu-$(SHORT_VERSION)/boot usr/lib/xen-$(VERSION)$(ABINAME)/boot
# TODO: move to xen-common and /etc/xen/scripts
DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp
etc/xen/scripts/qemu-ifup etc/xen/scripts
DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp
usr/lib/xen-ioemu-$(SHORT_VERSION) usr/lib