Bastian Blank
2008-Mar-07 12:54 UTC
[Pkg-xen-changes] r537 - trunk/xen-unstable/debian/patches
Author: waldi
Date: Fri Mar 7 12:54:16 2008
New Revision: 537
Log:
debian/patches: Update.
Modified:
trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
trunk/xen-unstable/debian/patches/tools-prefix.diff
trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff
trunk/xen-unstable/debian/patches/tools-rpath.diff
Modified: trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-lib-abiname.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-lib-abiname.diff Fri Mar 7 12:54:16
2008
@@ -187,13 +187,13 @@
all: build
@@ -35,10 +32,8 @@
install: build
- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-+ $(INSTALL_PROG) libflask.so $(DESTDIR)$(LIBDIR)
- $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
-- ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
-- ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
+- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_PROG) libflask.so $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DATA) libflask.a $(DESTDIR)$(PRIVATE_LIBDIR)
+- ln -sf libflask.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so.$(MAJOR)
+- ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so
$(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
.PHONY: TAGS
Modified: trunk/xen-unstable/debian/patches/tools-prefix.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-prefix.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-prefix.diff Fri Mar 7 12:54:16 2008
@@ -36,25 +36,18 @@
.PHONY: clean
--- xen-unstable.orig/tools/python/Makefile
+++ xen-unstable/tools/python/Makefile
-@@ -24,7 +24,7 @@
+@@ -75,12 +75,11 @@
- .PHONY: build buildpy
- buildpy: xsm.py
-- CC="$(CC)" CFLAGS="$(CFLAGS)"
XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build
-+ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)"
XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build
-
- build: buildpy refresh-pot refresh-po $(CATALOGS)
-
-@@ -77,10 +77,10 @@
+ .PHONY: install
ifndef XEN_PYTHON_NATIVE_INSTALL
- install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin;
print auxbin.libpath()")
+-install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin;
print auxbin.libpath()")
install: install-messages install-dtd
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix="" --force
--install-lib="$(DESTDIR)$(LIBPATH)/python"
-+ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py install
--home="$(DESTDIR)/usr/$(LIBDIR)"
--install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --force
++ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)$(PRIVATE_PREFIX)"
else
install: install-messages install-dtd
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)" --force
-+ CC="$(CC)" CFLAGS="$(CFLAGS)"
LIBDIR="$(LIBDIR)" python setup.py install
--root="$(DESTDIR)" --force
++ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)"
endif
install-dtd: all
@@ -113,7 +106,7 @@
clean:
--- xen-unstable.orig/tools/xenstore/Makefile
+++ xen-unstable/tools/xenstore/Makefile
-@@ -95,18 +95,17 @@
+@@ -96,18 +96,17 @@
install: all
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
@@ -248,3 +241,23 @@
$(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
+--- xen-unstable.orig/tools/flask/libflask/Makefile
++++ xen-unstable/tools/flask/libflask/Makefile
+@@ -33,12 +33,12 @@
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+- $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
+- ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
+- ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
++ $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_DATA) libflask.a $(DESTDIR)$(PRIVATE_LIBDIR)
++ ln -sf libflask.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so.$(MAJOR)
++ ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libflask.so
+ $(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
+
+ .PHONY: TAGS
Modified: trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff Fri Mar 7
12:54:16 2008
@@ -1,23 +1,18 @@
---- xen-3.orig/tools/pygrub/Makefile
-+++ xen-3/tools/pygrub/Makefile
-@@ -6,13 +6,12 @@
- all: build
- .PHONY: build
- build:
-- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
-+ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR=$(LIBDIR) python
setup.py build
+--- xen-unstable.orig/tools/pygrub/Makefile
++++ xen-unstable/tools/pygrub/Makefile
+@@ -10,9 +10,8 @@
.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)
++ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)$(PRIVATE_PREFIX)"
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
else
install: all
---- xen-3.orig/tools/pygrub/src/pygrub
-+++ xen-3/tools/pygrub/src/pygrub
+--- xen-unstable.orig/tools/pygrub/src/pygrub
++++ xen-unstable/tools/pygrub/src/pygrub
@@ -21,7 +21,7 @@
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt
@@ -27,19 +22,3 @@
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"],
Modified: trunk/xen-unstable/debian/patches/tools-rpath.diff
=============================================================================---
trunk/xen-unstable/debian/patches/tools-rpath.diff (original)
+++ trunk/xen-unstable/debian/patches/tools-rpath.diff Fri Mar 7 12:54:16 2008
@@ -15,7 +15,7 @@
XEN_ROOT = "../.."
extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
-+extra_link_args = [ "-Wl,-rpath,${ORIGIN}/../../../.." ]
++extra_link_args = [ "-Wl,-rpath,${ORIGIN}/../../.." ]
include_dirs = [ XEN_ROOT + "/tools/libxc",
XEN_ROOT + "/tools/xenstore",
@@ -203,3 +203,19 @@
xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
+--- 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,${ORIGIN}/.." ]
+
+ 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"],