[Pkg-xen-changes] r828 - trunk/xen/debian/patches

[Bastian Blank]

Author: waldi
Date: Wed Mar  9 16:40:34 2011
New Revision: 828

Log:
debian/patches: Fold patch.

Deleted:
   trunk/xen/debian/patches/tools-pygrub-rpath.diff
Modified:
   trunk/xen/debian/patches/series
   trunk/xen/debian/patches/tools-pygrub-prefix.diff

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Wed Mar  9 14:21:23 2011	(r827)
+++ trunk/xen/debian/patches/series	Wed Mar  9 16:40:34 2011	(r828)
@@ -14,7 +14,6 @@
 tools-misc-prefix.diff
 tools-misc-rpath.diff
 tools-pygrub-prefix.diff
-tools-pygrub-rpath.diff
 tools-python-prefix.diff
 tools-python-rpath.diff
 tools-xcutils-rpath.diff

Modified: trunk/xen/debian/patches/tools-pygrub-prefix.diff
==============================================================================
--- trunk/xen/debian/patches/tools-pygrub-prefix.diff	Wed Mar  9 14:21:23 2011	(r827)
+++ trunk/xen/debian/patches/tools-pygrub-prefix.diff	Wed Mar  9 16:40:34 2011	(r828)
@@ -1,6 +1,6 @@
 --- a/tools/pygrub/src/pygrub
 +++ b/tools/pygrub/src/pygrub
-@@ -21,6 +21,8 @@
+@@ -22,6 +22,8 @@
  import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
  import getopt
  
@@ -9,3 +9,19 @@
  import fsimage
  import grub.GrubConf
  import grub.LiloConf
+--- a/tools/pygrub/setup.py
++++ b/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"],