summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2015-02-19 09:05:14 +0200
committerRiku Voipio <riku.voipio@linaro.org>2015-02-19 09:05:14 +0200
commita448002bc95d870d99266d76cc0ce46dec96c706 (patch)
tree81327f14d17302124b93544a6b53f04a54c45f50
parenta1c833320563853d6257a4b82604919914d4521b (diff)
refresh patches
-rw-r--r--debian/patches/tools-pygrub-prefix.diff14
1 files changed, 4 insertions, 10 deletions
diff --git a/debian/patches/tools-pygrub-prefix.diff b/debian/patches/tools-pygrub-prefix.diff
index 9da0417..a6e4644 100644
--- a/debian/patches/tools-pygrub-prefix.diff
+++ b/debian/patches/tools-pygrub-prefix.diff
@@ -10,12 +10,10 @@ Patch-Name: tools-pygrub-prefix.diff
tools/pygrub/src/pygrub | 2 ++
3 files changed, 4 insertions(+), 5 deletions(-)
-diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
-index 3dff608..5fe4a80 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
-@@ -13,11 +13,6 @@ install: all
- CC="$(CC)" CFLAGS="$(CFLAGS) $(APPEND_LDFLAGS)" $(PYTHON) setup.py install \
+@@ -15,11 +15,6 @@
+ 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 \
@@ -26,11 +24,9 @@ index 3dff608..5fe4a80 100644
.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
+@@ -4,11 +4,13 @@
import sys
extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
@@ -44,11 +40,9 @@ index 52dcf57..8a1be9a 100644
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 3ec52fd..ed5b5d6 100755
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
-@@ -22,6 +22,8 @@ import xen.lowlevel.xc
+@@ -22,6 +22,8 @@
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt