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

[Ritesh Raj Sarraf]

 debian/changelog |    8 ++++++++
 debian/control   |    2 +-
 debian/rules     |   15 ++++++---------
 3 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit 47858f6f79a90a4d2de2280cc0c64889ddb6c937
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Sat Jan 7 20:44:13 2017 +0530

    Update changelog for release to Unstable

diff --git a/debian/changelog b/debian/changelog
index 2ebd851..5410ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+user-mode-linux (4.8-1um-3) unstable; urgency=medium
+
+  * [127dbbc] Drop dependency on gcc-5
+  * [1b4b24d] Enable parallel build
+  * Rebuild with latest Linux 4.8, 4.8.15-2
+
+ -- Ritesh Raj Sarraf <rrs at debian.org>  Sat, 07 Jan 2017 20:42:32 +0530
+
 user-mode-linux (4.8-1um-2) unstable; urgency=medium
 
   * Rebuild with latest Linux 4.8, with all stable security fixes 

commit 1b4b24d9631b4979861aaf36027f60d89472c8f5
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Sat Dec 31 15:41:42 2016 +0530

    Enable parallel build

diff --git a/debian/rules b/debian/rules
index de55d0a..d73c753 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ tmp:=$(debian)/user-mode-linux
 tmpmodules:=$(debian)/uml-modules
 DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 #SUBARCH?=$(shell uname -m)
+DEB_BUILD_OPTIONS ?= "parallel=$(shell getconf _NPROCESSORS_ONLN)"
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 KBUILDVARS := CFLAGS_KERNEL=-O1

commit 127dbbc1809f7a8b5d71bcad26ba54d8f2daa633
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Sat Dec 31 15:32:35 2016 +0530

    Drop dependency on gcc-5

diff --git a/debian/control b/debian/control
index e231f06..a23ed2c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: user-mode-linux
 Section: kernel
 Priority: extra
 Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 9.0.0), quilt, linux-source-4.8, docbook-to-man, xz-utils, m4, kmod, libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2), libssl-dev, gcc-5
+Build-Depends: debhelper (>> 9.0.0), quilt, linux-source-4.8, docbook-to-man, xz-utils, m4, kmod, libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2), libssl-dev
 Uploaders: Mattia Dongili <malattia at debian.org>, Ritesh Raj Sarraf <rrs at debian.org>
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-uml/user-mode-linux.git
diff --git a/debian/rules b/debian/rules
index de55d0a..6795247 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,26 +19,23 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 KBUILDVARS := CFLAGS_KERNEL=-O1
 endif
 
-# Compile UML with gcc-5
-CC='CC=gcc-5'
-
 # development only targets
 #
 copy-config:
 	cp config.$(DEB_HOST_ARCH) $(kernel_src)/.config
 
 oldconfig32: unpack copy-config
-	make -C $(kernel_src) oldconfig $(CC) ARCH=um SUBARCH=i386
+	make -C $(kernel_src) oldconfig ARCH=um SUBARCH=i386
 	cp config.i386 config.i386.oldconfig.old
 	cp $(kernel_src)/.config config.i386
 
 oldconfig64: unpack copy-config
-	make -C $(kernel_src) oldconfig $(CC) ARCH=um SUBARCH=x86_64
+	make -C $(kernel_src) oldconfig ARCH=um SUBARCH=x86_64
 	cp config.amd64 config.amd64.oldconfig.old
 	cp $(kernel_src)/.config config.amd64
 
 menuconfig: unpack copy-config
-	make -C $(kernel_src)  menuconfig $(CC) ARCH=um
+	make -C $(kernel_src)  menuconfig ARCH=um
 	cp config.$(DEB_HOST_ARCH) config.$(DEB_HOST_ARCH).menuconfig.old
 	cp $(kernel_src)/.config config.$(DEB_HOST_ARCH)
 
@@ -63,7 +60,7 @@ configure: configure-stamp
 configure-stamp: patch-stamp $(kernel_src)/.config
 	dh_testdir
 
-	$(MAKE) -C $(kernel_src) $(config_target) $(CC) ARCH=um
+	$(MAKE) -C $(kernel_src) $(config_target) ARCH=um
 
 	touch $@
 
@@ -75,7 +72,7 @@ build-indep: build-stamp
 build-stamp: configure
 	dh_testdir
 
-	$(MAKE) -C $(kernel_src) $(KBUILDVARS) linux modules $(CC) ARCH=um
+	$(MAKE) -C $(kernel_src) $(KBUILDVARS) linux modules ARCH=um
 	docbook-to-man linux.sgml > linux.uml.1
 
 	touch $@
@@ -108,7 +105,6 @@ endif
 	install $(kernel_src)/linux $(tmp)/usr/bin/linux.uml
 
 	$(MAKE) -C $(kernel_src) modules_install \
-	    	$(CC) \
 		ARCH=um \
 		INSTALL_MOD_PATH=$(tmpmodules) \
 		INSTALL_MOD_STRIP=$(MODSTRIP)