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

Tue Dec 26 04:31:53 UTC 2017

debian/changelog                                |    7 +++++++
 debian/control                                  |    2 +-
 debian/patches/05_fix_static_build.patch        |    8 +++-----
 debian/patches/06-fix-linkage-on-386-arch.patch |   12 +++++-------
 debian/patches/07-remove-rpath.patch            |   10 +++-------
 debian/rules                                    |    2 +-
 6 files changed, 20 insertions(+), 21 deletions(-)

New commits:
commit 68e35be2f737a27135ca3b2ed4a7fd358c813386
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Tue Dec 26 09:01:18 2017 +0530

    Update changelog for release to Unstable

diff --git a/debian/changelog b/debian/changelog
index 9bfbc5d..cdbebd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+user-mode-linux (4.14-1um-1) unstable; urgency=medium
+
+  * [8fdb9d1] Newer Linux version, 4.14
+  * [398892e] Refresh patches
+
+ -- Ritesh Raj Sarraf <rrs at debian.org>  Tue, 26 Dec 2017 09:00:59 +0530
+
 user-mode-linux (4.13-1um-1) unstable; urgency=medium
 
   * [a1b6db8] Bump UML to newer 4.13 kernel (Closes: #880304)

commit 398892e8eac4ed3a7bf03e1a744b11ed26f03076
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Tue Dec 26 08:56:32 2017 +0530

    Refresh patches

diff --git a/debian/patches/05_fix_static_build.patch b/debian/patches/05_fix_static_build.patch
index df63635..4ebcf4b 100644
--- a/debian/patches/05_fix_static_build.patch
+++ b/debian/patches/05_fix_static_build.patch
@@ -1,11 +1,9 @@
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494995
 Fix symbol clash between libc and the kernel.
 
-Index: linux-source-3.2/arch/um/Makefile
-===================================================================
---- linux-source-3.2.orig/arch/um/Makefile	2013-01-04 07:21:26.329471368 +0900
-+++ linux-source-3.2/arch/um/Makefile	2013-01-04 07:21:46.117248747 +0900
-@@ -76,7 +76,8 @@
+--- a/arch/um/Makefile
++++ b/arch/um/Makefile
+@@ -95,7 +95,8 @@
  # defines more robust
  
  KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
diff --git a/debian/patches/06-fix-linkage-on-386-arch.patch b/debian/patches/06-fix-linkage-on-386-arch.patch
index 447aefc..9736189 100644
--- a/debian/patches/06-fix-linkage-on-386-arch.patch
+++ b/debian/patches/06-fix-linkage-on-386-arch.patch
@@ -1,14 +1,12 @@
-diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile
-index 8fb5840..f322503 100644
 --- a/arch/x86/um/Makefile
 +++ b/arch/x86/um/Makefile
-@@ -19,7 +19,8 @@ ifeq ($(CONFIG_X86_32),y)
- obj-y += checksum_32.o
- obj-$(CONFIG_BINFMT_ELF) += elfcore.o
+@@ -20,7 +20,8 @@
+ obj-y += checksum_32.o syscalls_32.o
+ obj-$(CONFIG_ELF_CORE) += elfcore.o
  
 -subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
 +subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o \
 +	../lib/atomic64_386_32.o ../lib/cmpxchg8b_emu.o
  subarch-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += ../lib/rwsem.o
- subarch-$(CONFIG_HIGHMEM) += ../mm/highmem_32.o
-
+ 
+ else
diff --git a/debian/patches/07-remove-rpath.patch b/debian/patches/07-remove-rpath.patch
index aac233a..3de3648 100644
--- a/debian/patches/07-remove-rpath.patch
+++ b/debian/patches/07-remove-rpath.patch
@@ -6,23 +6,19 @@ Date:   Fri Apr 6 07:18:17 2012 +0900
     
     Signed-off-by: Mattia Dongili <malattia at linux.it>
 
-diff --git a/arch/um/Makefile b/arch/um/Makefile
-index 133f7de..1c9d353 100644
 --- a/arch/um/Makefile
 +++ b/arch/um/Makefile
-@@ -107,7 +107,6 @@ archheaders:
+@@ -122,7 +122,6 @@
  archprepare: include/generated/user_constants.h
  
  LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
--LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
+-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)
  
  CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \
  	$(call cc-option, -fno-stack-protector,) \
-diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
-index 36b62bc..d922e86 100644
 --- a/arch/x86/Makefile.um
 +++ b/arch/x86/Makefile.um
-@@ -50,9 +50,6 @@ KBUILD_CPPFLAGS += -m64
+@@ -51,9 +51,6 @@
  ELF_ARCH := i386:x86-64
  ELF_FORMAT := elf64-x86-64
  

commit 8fdb9d14c3eb4acfdea93d1c40e0ccae7fe3f218
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Mon Dec 25 13:22:54 2017 +0530

    Newer Linux version, 4.14

diff --git a/debian/control b/debian/control
index b2a2d66..a545c03 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.13, docbook-to-man, xz-utils, m4, kmod, libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2), libssl-dev
+Build-Depends: debhelper (>> 9.0.0), quilt, linux-source-4.14, 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 40fa144..685d37c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 config_target:=oldconfig
-kernel_version:=4.13
+kernel_version:=4.14
 kernel_src:=linux-source-$(kernel_version)
 BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W linux-source-$(kernel_version))
 debian:=$(CURDIR)/debian

