[Pkg-xen-changes] [xen] 12/70: tools-pygrub-prefix.diff

[Ian James Campbell]

This is an automated email from the git hooks/post-receive script.

ijc pushed a commit to branch feature/bug805508
in repository xen.

commit 06f0bbb294c3d81c2a2a806440dd73f2fc9813c7
Author: Bastian Blank <waldi at debian.org>
Date:   Sat Jul 5 11:47:01 2014 +0200

    tools-pygrub-prefix.diff
    
    Patch-Name: tools-pygrub-prefix.diff
---
 tools/pygrub/Makefile   | 5 -----
 tools/pygrub/setup.py   | 2 ++
 tools/pygrub/src/pygrub | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index fe8e03b..5d83907 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -15,11 +15,6 @@ install: all
 	CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(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 52dcf57..8a1be9a 100644
--- 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 e4aedda..a50ed79 100755
--- 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git