[kernel] r22003 - in dists/sid/linux/debian: . templates

[Ben Hutchings]

Author: benh
Date: Fri Oct 31 06:16:08 2014
New Revision: 22003

Log:
linux-image: Recommend irqbalance if CONFIG_SMP is enabled (Closes: #577788)

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/rules.real
   dists/sid/linux/debian/templates/control.image.type-plain.in

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Oct 31 02:55:23 2014	(r22002)
+++ dists/sid/linux/debian/changelog	Fri Oct 31 06:16:08 2014	(r22003)
@@ -148,6 +148,8 @@
     (CVE-2014-3688)
   * mnt: Prevent pivot_root from creating a loop in the mount tree
     (CVE-2014-7970)
+  * linux-image: Recommend irqbalance if CONFIG_SMP is enabled
+    (Closes: #577788)
 
   [ Mauricio Faria de Oliveira ]
   * [ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles

Modified: dists/sid/linux/debian/rules.real
==============================================================================
--- dists/sid/linux/debian/rules.real	Fri Oct 31 02:55:23 2014	(r22002)
+++ dists/sid/linux/debian/rules.real	Fri Oct 31 06:16:08 2014	(r22003)
@@ -366,7 +366,10 @@
 	+$(MAKE_SELF) \
 	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \
 	  PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
-	+$(MAKE_SELF) install-base
+	+$(MAKE_SELF) install-base GENCONTROL_ARGS='-Vkernel:Recommends='"$$( \
+		if grep -q '^CONFIG_SMP=y' $(DIR)/.config; then \
+			printf irqbalance,; \
+		fi)"
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_dt: DT_INSTALL_DIR = $(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_dt:

Modified: dists/sid/linux/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/sid/linux/debian/templates/control.image.type-plain.in	Fri Oct 31 02:55:23 2014	(r22002)
+++ dists/sid/linux/debian/templates/control.image.type-plain.in	Fri Oct 31 06:16:08 2014	(r22003)
@@ -2,7 +2,7 @@
 Provides: linux-modules- at abiname@@localversion@
 Pre-Depends: debconf | debconf-2.0
 Depends: kmod | module-init-tools, linux-base (>= 3~), ${misc:Depends}
-Recommends: firmware-linux-free (>= 3~)
+Recommends: firmware-linux-free (>= 3~), ${kernel:Recommends}
 Suggests: linux-doc- at version@, debian-kernel-handbook
 Breaks: at (<< 3.1.12-1+squeeze1)
 Description: Linux @upstreamversion@ for @class@