tools-pygrub-prefix.diff

Patch-Name: tools-pygrub-prefix.diff

Gbp-Pq: Name tools-pygrub-prefix.diff

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index a31849078ce9cd04b70a65a06361c24699df5aca..7db4edc36d0b9dd3caf3640b00ec542c45126774 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -16,11 +16,6 @@ install: all
        CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
                setup.py install $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)"  \
                --install-scripts=$(LIBEXEC_BIN) --force
-       set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
-                    "`readlink -f $(DESTDIR)/$(bindir)`" != \
-                    "`readlink -f $(LIBEXEC_BIN)`" ]; then \
-           ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(bindir); \
-       fi
 
 .PHONY: clean
 clean:

diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py
index 52dcf5737393c6aee10d9bfce0d69db856f96a40..8a1be9af1cbba09c481cdedce75d1eaa83288d3e 100644 (file)
--- a/tools/pygrub/setup.py
+++ b/tools/pygrub/setup.py
@@ -4,11 +4,13 @@ import os
 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"],

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index dd0c8f77dfb6fd96747626e3e2299040e285c00e..bfcfb4fe79f1b81cf34887bd10298faf989c579b 100755 (executable)
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -21,6 +21,8 @@ import xen.lowlevel.xc
 import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
 import getopt
 
+sys.path.insert(1, sys.path[0] + '/../lib/python')
+
 import fsimage
 import grub.GrubConf
 import grub.LiloConf