Author: waldi
Date: Thu Aug 2 12:41:07 2007
New Revision: 416
Log:
* debian/patches/series, debian/patches/tools-prefix.diff: Update.
* debian/patches/tools-libfsimage-prefix.diff,
debian/patches/tools-pygrub-prefix.diff: Add.
Added:
trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff
trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
Modified:
trunk/xen-3/debian/patches/series
trunk/xen-3/debian/patches/tools-prefix.diff
Modified: trunk/xen-3/debian/patches/series
=============================================================================---
trunk/xen-3/debian/patches/series (original)
+++ trunk/xen-3/debian/patches/series Thu Aug 2 12:41:07 2007
@@ -8,3 +8,5 @@
tools-python-xen-xm-relative-path.diff
tools-ioemu-arch.diff
tools-ioemu-config.diff
+tools-pygrub-prefix.diff
+tools-libfsimage-prefix.diff
Added: trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff
=============================================================================---
(empty file)
+++ trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff Thu Aug 2 12:41:07
2007
@@ -0,0 +1,27 @@
+--- xen-3.orig/tools/libfsimage/Rules.mk
++++ xen-3/tools/libfsimage/Rules.mk
+@@ -7,11 +7,8 @@
+
+ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
+
+-FSDIR-$(CONFIG_Linux) = $(LIBDIR)/fs/$(FS)
+-FSDIR-$(CONFIG_SunOS)-x86_64 = lib/fs/$(FS)/64
+-FSDIR-$(CONFIG_SunOS)-x86_32 = lib/fs/$(FS)/
+-FSDIR-$(CONFIG_SunOS) = $(FSDIR-$(CONFIG_SunOS)-$(XEN_TARGET_ARCH))
+-FSDIR = $(FSDIR-y)
++LIBDIR = lib/pygrub
++FSDIR = $(LIBDIR)/fs/$(FS)
+
+ FSLIB = fsimage.so
+
+--- xen-3.orig/tools/libfsimage/common/Makefile
++++ xen-3/tools/libfsimage/common/Makefile
+@@ -1,6 +1,8 @@
+ XEN_ROOT = ../../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
++LIBDIR = lib/pygrub
++
+ MAJOR = 1.0
+ MINOR = 0
+
Modified: trunk/xen-3/debian/patches/tools-prefix.diff
=============================================================================---
trunk/xen-3/debian/patches/tools-prefix.diff (original)
+++ trunk/xen-3/debian/patches/tools-prefix.diff Thu Aug 2 12:41:07 2007
@@ -66,17 +66,6 @@
.PHONY: clean
clean:
---- xen-3.orig/tools/pygrub/Makefile
-+++ xen-3/tools/pygrub/Makefile
-@@ -12,7 +12,7 @@
- ifndef XEN_PYTHON_NATIVE_INSTALL
- install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import
auxbin; print auxbin.libpath()")
- install: all
-- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix=""
--install-lib="$(DESTDIR)$(LIBPATH)/python"
-+ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py install
--home="$(DESTDIR)/usr/$(LIBDIR)" --prefix=""
--install-lib="$(DESTDIR)/usr/$(LIBDIR)/python"
--install-scripts=$(DESTDIR)/usr/$(BINDIR)
- $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
- else
- install: all
--- xen-3.orig/tools/python/Makefile
+++ xen-3/tools/python/Makefile
@@ -16,7 +16,7 @@
Added: trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
=============================================================================---
(empty file)
+++ trunk/xen-3/debian/patches/tools-pygrub-prefix.diff Thu Aug 2 12:41:07 2007
@@ -0,0 +1,52 @@
+--- xen-3.orig/tools/pygrub/Makefile
++++ xen-3/tools/pygrub/Makefile
+@@ -2,17 +2,19 @@
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
++BINDIR = bin
++LIBDIR = lib/pygrub
++
+ .PHONY: all
+ all: build
+ .PHONY: build
+ build:
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
++ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR=$(LIBDIR) python
setup.py build
+
+ .PHONY: install
+ ifndef XEN_PYTHON_NATIVE_INSTALL
+-install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import
auxbin; print auxbin.libpath()")
+ install: all
+- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix=""
--install-lib="$(DESTDIR)$(LIBPATH)/python"
++ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR=$(LIBDIR) python
setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)"
--prefix="" --install-lib="$(DESTDIR)/usr/$(LIBDIR)/python"
--install-scripts=$(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ else
+ install: all
+--- xen-3.orig/tools/pygrub/src/pygrub
++++ xen-3/tools/pygrub/src/pygrub
+@@ -21,7 +21,7 @@
+ import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
+ import getopt
+
+-sys.path = [ ''/usr/lib/python'' ] + sys.path
++sys.path = [ ''/usr/lib/pygrub/python'' ] + sys.path
+
+ import fsimage
+ import grub.GrubConf
+--- xen-3.orig/tools/pygrub/setup.py
++++ xen-3/tools/pygrub/setup.py
+@@ -4,11 +4,13 @@
+ import sys
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
++extra_link_args = [ "-Wl,-rpath,/usr/%s" %
os.environ[''LIBDIR''] ]
+
+ XEN_ROOT = "../.."
+
+ fsimage = Extension("fsimage",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ libraries = ["fsimage"],