[Pkg-uml-commit] user-mode-linux: Changes to 'master'
Ritesh Raj Sarraf
rrs at moszumanska.debian.org
Tue Nov 1 15:35:02 UTC 2016
debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/rules | 19 ++++++++++---------
3 files changed, 19 insertions(+), 10 deletions(-)
New commits:
commit c968c6e337314615b1868ce12daf62459e0e3bb4
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date: Tue Nov 1 18:50:30 2016 +0530
Update changelog for release to Unstable
diff --git a/debian/changelog b/debian/changelog
index c657a76..f1ba69c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+user-mode-linux (4.8-1um-1) unstable; urgency=medium
+
+ * [b4834f3] Use gcc-5 to build the kernel
+ * [ee7785d] Revert "Fix uml kernel build, disabling PIE and bindnow"
+ * [e0b3e3d] Bump linux version to 4.8
+
+ -- Ritesh Raj Sarraf <rrs at debian.org> Tue, 01 Nov 2016 17:53:39 +0530
+
user-mode-linux (4.7-1um-2) unstable; urgency=medium
* [9a4719f] Fix uml kernel build, disabling PIE and bindnow.
commit c399438eab3d1309b0fa2b66577c801dfc3b74ae
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date: Tue Nov 1 15:24:03 2016 +0530
Set and use a variable
Fix variable CC
diff --git a/debian/rules b/debian/rules
index cc1b3a7..de55d0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,23 +19,26 @@ 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=gcc-5 ARCH=um SUBARCH=i386
+ make -C $(kernel_src) oldconfig $(CC) 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=gcc-5 ARCH=um SUBARCH=x86_64
+ make -C $(kernel_src) oldconfig $(CC) 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=gcc-5 ARCH=um
+ make -C $(kernel_src) menuconfig $(CC) ARCH=um
cp config.$(DEB_HOST_ARCH) config.$(DEB_HOST_ARCH).menuconfig.old
cp $(kernel_src)/.config config.$(DEB_HOST_ARCH)
@@ -60,7 +63,7 @@ configure: configure-stamp
configure-stamp: patch-stamp $(kernel_src)/.config
dh_testdir
- $(MAKE) -C $(kernel_src) $(config_target) CC=gcc-5 ARCH=um
+ $(MAKE) -C $(kernel_src) $(config_target) $(CC) ARCH=um
touch $@
@@ -72,7 +75,7 @@ build-indep: build-stamp
build-stamp: configure
dh_testdir
- $(MAKE) -C $(kernel_src) $(KBUILDVARS) linux modules CC=gcc-5 ARCH=um
+ $(MAKE) -C $(kernel_src) $(KBUILDVARS) linux modules $(CC) ARCH=um
docbook-to-man linux.sgml > linux.uml.1
touch $@
@@ -105,7 +108,7 @@ endif
install $(kernel_src)/linux $(tmp)/usr/bin/linux.uml
$(MAKE) -C $(kernel_src) modules_install \
- CC=gcc-5 \
+ $(CC) \
ARCH=um \
INSTALL_MOD_PATH=$(tmpmodules) \
INSTALL_MOD_STRIP=$(MODSTRIP)
commit e0b3e3d8e91b504a25aebe0de969fbe8225f491d
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date: Mon Oct 31 21:18:18 2016 +0530
Bump linux version to 4.8
diff --git a/debian/control b/debian/control
index 8b3fc1d..e231f06 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.7, 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, gcc-5
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 d3fca06..cc1b3a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
#export DH_VERBOSE=1
config_target:=oldconfig
-kernel_version:=4.7
+kernel_version:=4.8
kernel_src:=linux-source-$(kernel_version)
BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W linux-source-$(kernel_version))
debian:=$(CURDIR)/debian
commit 5508620df2ed9b26df963a5f9e5b8551abeddf0a
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date: Sun Oct 30 23:01:36 2016 +0530
Explicitly specify gcc-5 in all occurences
diff --git a/debian/rules b/debian/rules
index b7ba6f8..d3fca06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,17 +25,17 @@ copy-config:
cp config.$(DEB_HOST_ARCH) $(kernel_src)/.config
oldconfig32: unpack copy-config
- CC=gcc-5 make -C $(kernel_src) oldconfig ARCH=um SUBARCH=i386
+ make -C $(kernel_src) oldconfig CC=gcc-5 ARCH=um SUBARCH=i386
cp config.i386 config.i386.oldconfig.old
cp $(kernel_src)/.config config.i386
oldconfig64: unpack copy-config
- CC=gcc-5 make -C $(kernel_src) oldconfig ARCH=um SUBARCH=x86_64
+ make -C $(kernel_src) oldconfig CC=gcc-5 ARCH=um SUBARCH=x86_64
cp config.amd64 config.amd64.oldconfig.old
cp $(kernel_src)/.config config.amd64
menuconfig: unpack copy-config
- CC=gcc-5 make -C $(kernel_src) menuconfig ARCH=um
+ make -C $(kernel_src) menuconfig CC=gcc-5 ARCH=um
cp config.$(DEB_HOST_ARCH) config.$(DEB_HOST_ARCH).menuconfig.old
cp $(kernel_src)/.config config.$(DEB_HOST_ARCH)
@@ -60,7 +60,7 @@ configure: configure-stamp
configure-stamp: patch-stamp $(kernel_src)/.config
dh_testdir
- $(MAKE) -C $(kernel_src) $(config_target) ARCH=um
+ $(MAKE) -C $(kernel_src) $(config_target) CC=gcc-5 ARCH=um
touch $@
@@ -72,7 +72,7 @@ build-indep: build-stamp
build-stamp: configure
dh_testdir
- $(MAKE) -C $(kernel_src) $(KBUILDVARS) linux modules ARCH=um
+ $(MAKE) -C $(kernel_src) $(KBUILDVARS) linux modules CC=gcc-5 ARCH=um
docbook-to-man linux.sgml > linux.uml.1
touch $@
@@ -105,6 +105,7 @@ endif
install $(kernel_src)/linux $(tmp)/usr/bin/linux.uml
$(MAKE) -C $(kernel_src) modules_install \
+ CC=gcc-5 \
ARCH=um \
INSTALL_MOD_PATH=$(tmpmodules) \
INSTALL_MOD_STRIP=$(MODSTRIP)
commit ee7785db1b2d2b891178b3e40c15ddb33fe1f29e
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date: Sun Oct 30 21:44:22 2016 +0530
Revert "Fix uml kernel build, disabling PIE and bindnow"
This reverts commit 6deead454f7289ee1e9589a09e465509718b1ae2.
diff --git a/debian/rules b/debian/rules
index 2168806..b7ba6f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,9 @@ DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
#SUBARCH?=$(shell uname -m)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS_KERNEL += -O1
+KBUILDVARS := CFLAGS_KERNEL=-O1
endif
-KBUILDVARS := CFLAGS_KERNEL="$(CFLAGS_KERNEL)" CC="$(CC) -no-pie"
-LD="$(LD) -no-pie"
-
# development only targets
#
copy-config:
commit b4834f3bd5112b6424fda6516e4adc8bd28ccad7
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date: Sun Oct 30 21:44:12 2016 +0530
Use gcc-5 to build the kernel
diff --git a/debian/control b/debian/control
index 3afe5f3..8b3fc1d 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.7, 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.7, docbook-to-man, xz-utils, m4, kmod, libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2), libssl-dev, gcc-5
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 2bdfad8..2168806 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,17 +28,17 @@ copy-config:
cp config.$(DEB_HOST_ARCH) $(kernel_src)/.config
oldconfig32: unpack copy-config
- make -C $(kernel_src) oldconfig ARCH=um SUBARCH=i386
+ CC=gcc-5 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 ARCH=um SUBARCH=x86_64
+ CC=gcc-5 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 ARCH=um
+ CC=gcc-5 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)
More information about the Pkg-uml-commit
mailing list