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

Mattia Dongili malattia at alioth.debian.org
Thu Jan 3 23:00:56 UTC 2013 

 config.amd64                                 |   17 ++++++++++-------
 config.i386                                  |   16 ++++++++++------
 debian/changelog                             |   11 +++++++++++
 debian/control                               |    3 ++-
 debian/patches/02_x-terminal-emulator.patch  |   10 +++++-----
 debian/patches/04_remove_irqf_disabled.patch |    8 +++++---
 debian/patches/05_fix_static_build.patch     |    8 ++++----
 debian/rules                                 |    3 ++-
 8 files changed, 49 insertions(+), 27 deletions(-)

New commits:
commit 65eaf50ede16f617f1100b4cbd455a0a28d4e947
Author: Mattia Dongili <malattia at linux.it>
Date:   Fri Jan 4 07:58:35 2013 +0900

    Prepare upload to comply  Policy §7.8
    
    Add Built-Using per Policy §7.8 (Closes: #679300).
    Refresh patches to apply with no fuzz to latest linux-source.
    Set new kernel options:
       SECURITY_APPARMOR_COMPAT_24=y
       NET_SCH_CODEL=m
       FQ_CODEL=m
    
    Signed-off-by: Mattia Dongili <malattia at linux.it>

diff --git a/config.amd64 b/config.amd64
index 231d4b2..fc0e225 100644
--- a/config.amd64
+++ b/config.amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# User Mode Linux/x86_64 3.2.12 Kernel Configuration
+# User Mode Linux/x86_64 3.2.35 Kernel Configuration
 #
 CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
 CONFIG_UML=y
@@ -223,7 +223,6 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=m
 CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -553,6 +552,10 @@ CONFIG_VIRTIO_BALLOON=m
 #
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_VIRT_DRIVERS is not set
+
+#
+# Microsoft Hyper-V guest support
+#
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_NET=y
 
@@ -970,6 +973,8 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
+# CONFIG_NET_SCH_CODEL is not set
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -1011,6 +1016,7 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=m
 CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BQL=y
 
 #
 # Network testing
@@ -1350,11 +1356,6 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
-CONFIG_PROTECTED_LINKS=y
-CONFIG_PROTECTED_SYMLINKS=y
-CONFIG_PROTECTED_SYMLINKS_SYSCTL=1
-CONFIG_PROTECTED_HARDLINKS=y
-CONFIG_PROTECTED_HARDLINKS_SYSCTL=1
 
 #
 # Security options
@@ -1384,6 +1385,7 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_APPARMOR_COMPAT_24=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
@@ -1548,6 +1550,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
+CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 # CONFIG_AVERAGE is not set
diff --git a/config.i386 b/config.i386
index 18f8acc..de5c13b 100644
--- a/config.i386
+++ b/config.i386
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# User Mode Linux/i386 3.2.13 Kernel Configuration
+# User Mode Linux/i386 3.2.35 Kernel Configuration
 #
 CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
 CONFIG_UML=y
@@ -580,6 +580,10 @@ CONFIG_VIRTIO_BALLOON=m
 #
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_VIRT_DRIVERS is not set
+
+#
+# Microsoft Hyper-V guest support
+#
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_NET=y
 
@@ -997,6 +1001,8 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -1038,6 +1044,7 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=m
 CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BQL=y
 
 #
 # Network testing
@@ -1377,11 +1384,6 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
-CONFIG_PROTECTED_LINKS=y
-CONFIG_PROTECTED_SYMLINKS=y
-CONFIG_PROTECTED_SYMLINKS_SYSCTL=1
-CONFIG_PROTECTED_HARDLINKS=y
-CONFIG_PROTECTED_HARDLINKS_SYSCTL=1
 
 #
 # Security options
@@ -1411,6 +1413,7 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_APPARMOR_COMPAT_24=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
@@ -1573,6 +1576,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
+CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 # CONFIG_AVERAGE is not set
diff --git a/debian/changelog b/debian/changelog
index 57d1f08..33d378f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+user-mode-linux (3.2-1um-2) unstable; urgency=high
+
+  * Add Built-Using per Policy §7.8 (Closes: #679300).
+  * Refresh patches to apply with no fuzz to latest linux-source.
+  * Set new kernel options:
+      SECURITY_APPARMOR_COMPAT_24=y
+      NET_SCH_CODEL=m
+      FQ_CODEL=m
+
+ -- Mattia Dongili <malattia at debian.org>  Fri, 04 Jan 2013 07:11:32 +0900
+
 user-mode-linux (3.2-1um-1) unstable; urgency=low
 
   [ Mattia Dongili ]
diff --git a/debian/control b/debian/control
index a9e9fd9..882d4c6 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 (>> 5.0.0), quilt, linux-source-3.2, docbook-to-man, bzip2, m4, module-init-tools, libvdeplug2-dev, libpcap-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, linux-source-3.2, docbook-to-man, bzip2, m4, module-init-tools, libvdeplug2-dev, libpcap-dev, dpkg (>= 1.16.2)
 Uploaders: Mattia Dongili <malattia at debian.org>, Ritesh Raj Sarraf <rrs at debian.org>
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-uml/user-mode-linux.git
@@ -12,6 +12,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-uml/user-mode-linux.git
 Package: user-mode-linux
 Architecture: i386 amd64
 Depends: ${misc:Depends}, ${shlibs:Depends}, uml-utilities (>= 20040406-1)
+Built-Using: ${Built-Using}
 Suggests: x-terminal-emulator, rootstrap, user-mode-linux-doc, slirp, vde2
 Description: User-mode Linux (kernel)
  User-mode Linux (UML) is a port of the Linux kernel to its own system
diff --git a/debian/patches/02_x-terminal-emulator.patch b/debian/patches/02_x-terminal-emulator.patch
index 3039c3d..5d0e2e1 100644
--- a/debian/patches/02_x-terminal-emulator.patch
+++ b/debian/patches/02_x-terminal-emulator.patch
@@ -1,11 +1,11 @@
 # Mattia Dongili <malattia at debian.org>
 # Matt Zimmermannn <mdz at debian.org>
 # Use Debian's x-terminal-emulator
-Index: linux-source-2.6.25/arch/um/drivers/xterm.c
+Index: linux-source-3.2/arch/um/drivers/xterm.c
 ===================================================================
---- linux-source-2.6.25.orig/arch/um/drivers/xterm.c	2008-07-05 11:16:50.444754992 +0900
-+++ linux-source-2.6.25/arch/um/drivers/xterm.c	2008-07-05 11:17:17.624764233 +0900
-@@ -42,7 +42,7 @@ static void *xterm_init(char *str, int d
+--- linux-source-3.2.orig/arch/um/drivers/xterm.c	2013-01-04 07:21:26.429470247 +0900
++++ linux-source-3.2/arch/um/drivers/xterm.c	2013-01-04 07:21:30.921419619 +0900
+@@ -40,7 +40,7 @@
  }
  
  /* Only changed by xterm_setup, which is a setup */
@@ -14,7 +14,7 @@ Index: linux-source-2.6.25/arch/um/drivers/xterm.c
  static char *title_switch = "-T";
  static char *exec_switch = "-e";
  
-@@ -79,7 +79,7 @@ __uml_setup("xterm=", xterm_setup,
+@@ -77,7 +77,7 @@
  "    respectively.  The title switch must have the form '<switch> title',\n"
  "    not '<switch>=title'.  Similarly, the exec switch must have the form\n"
  "    '<switch> command arg1 arg2 ...'.\n"
diff --git a/debian/patches/04_remove_irqf_disabled.patch b/debian/patches/04_remove_irqf_disabled.patch
index cb8aa19..5b862f3 100644
--- a/debian/patches/04_remove_irqf_disabled.patch
+++ b/debian/patches/04_remove_irqf_disabled.patch
@@ -1,9 +1,11 @@
 http://www.mail-archive.com/user-mode-linux-devel@lists.sourceforge.net/msg06464.html
 This patch make the guest network work again.
 
---- linux-source-2.6.30.orig/arch/um/drivers/net_kern.c	2009-06-10 12:05:27.000000000 +0900
-+++ linux-source-2.6.30/arch/um/drivers/net_kern.c	2009-07-05 23:32:30.952417452 +0900
-@@ -165,7 +165,7 @@ static int uml_net_open(struct net_devic
+Index: linux-source-3.2/arch/um/drivers/net_kern.c
+===================================================================
+--- linux-source-3.2.orig/arch/um/drivers/net_kern.c	2013-01-04 07:21:26.361471009 +0900
++++ linux-source-3.2/arch/um/drivers/net_kern.c	2013-01-04 07:21:42.777286266 +0900
+@@ -161,7 +161,7 @@
  	}
  
  	err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
diff --git a/debian/patches/05_fix_static_build.patch b/debian/patches/05_fix_static_build.patch
index 90e03f2..df63635 100644
--- a/debian/patches/05_fix_static_build.patch
+++ b/debian/patches/05_fix_static_build.patch
@@ -1,11 +1,11 @@
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494995
 Fix symbol clash between libc and the kernel.
 
-Index: linux-source-2.6.30/arch/um/Makefile
+Index: linux-source-3.2/arch/um/Makefile
 ===================================================================
---- linux-source-2.6.30.orig/arch/um/Makefile	2009-07-07 21:18:57.964418085 +0900
-+++ linux-source-2.6.30/arch/um/Makefile	2009-07-07 21:19:34.828766443 +0900
-@@ -66,7 +66,8 @@
+--- 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 @@
  # defines more robust
  
  KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
diff --git a/debian/rules b/debian/rules
index edb0ed4..b984185 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@
 config_target:=oldconfig
 kernel_version:=3.2
 kernel_dir:=linux-source-$(kernel_version)
+BUILT_USING := $(shell dpkg-query -f '$${binary:Package} (= $${source:Version}), ' -W linux-source-$(kernel_version))
 debian:=$(CURDIR)/debian
 tmp:=$(debian)/user-mode-linux
 tmpmodules:=$(debian)/uml-modules
@@ -143,7 +144,7 @@ binary-arch: build install
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VBuilt-Using="$(BUILT_USING)"
 	dh_md5sums
 	dh_builddeb

More information about the Pkg-uml-commit mailing list