[Pkg-uml-commit] user-mode-linux: Changes to 'master'

[Ritesh Raj Sarraf]

 debian/changelog |    7 +++++++
 debian/rules     |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit db39875f036f1707d74a6c24a7cd978d1461eedc
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Sat Oct 22 14:38:36 2016 +0530

    Update changelog for release to Unstable

diff --git a/debian/changelog b/debian/changelog
index bd0e7f5..c657a76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+user-mode-linux (4.7-1um-2) unstable; urgency=medium
+
+  * [9a4719f] Fix uml kernel build, disabling PIE and bindnow.
+    Thanks to Balint Reczey (Closes: 837579)
+
+ -- Ritesh Raj Sarraf <rrs at debian.org>  Sat, 22 Oct 2016 13:00:35 +0530
+
 user-mode-linux (4.7-1um-1) unstable; urgency=medium
 
   * [c36fba9] Add homepage field

commit 9a4719ffccbf6e8eb077d4fe841426a4d7dcea74
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Sat Oct 22 12:58:51 2016 +0530

    Fix uml kernel build, disabling PIE and bindnow
    
    Thanks: Balint Reczey
    Closes: 837579

diff --git a/debian/rules b/debian/rules
index e29da82..2bdfad8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,12 @@ DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 #SUBARCH?=$(shell uname -m)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-KBUILDVARS := CFLAGS_KERNEL=-O1
+CFLAGS_KERNEL += -O1
 endif
 
+KBUILDVARS := CFLAGS_KERNEL="$(CFLAGS_KERNEL)" CC="$(CC) -no-pie"
+LD="$(LD) -no-pie"
+
 # development only targets
 #
 copy-config: