[arch-commits] Commit in linux/trunk (PKGBUILD change-default-console-loglevel.patch)

[Tobias Powalowski]

    Date: Tuesday, August 5, 2014 @ 06:41:14
  Author: tpowa
Revision: 219301

upgpkg: linux 3.16-2

fix log messages on bootup

Modified:
  linux/trunk/PKGBUILD
  linux/trunk/change-default-console-loglevel.patch

---------------------------------------+
 PKGBUILD                              |   11 +++++++++--
 change-default-console-loglevel.patch |   21 ++++++++++-----------
 2 files changed, 19 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-05 01:18:32 UTC (rev 219300)
+++ PKGBUILD	2014-08-05 04:41:14 UTC (rev 219301)
@@ -6,7 +6,7 @@
 #pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-3.16
 pkgver=3.16
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -18,11 +18,13 @@
         'config' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
+        'change-default-console-loglevel.patch'
         )
 sha256sums=('4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0'
             '487dc1fd428b5793f4f5216fd76bd3640b12c50ea52c6fb909da24baf3612d9b'
             '1db5856f6c29380e828e3026a0ed8c344f0386fde83f03bf27ecb8fd6880ff32'
-            'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c')
+            'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
+            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
 
 _kernelname=${pkgbase#linux}
 
@@ -35,6 +37,11 @@
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
+  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
+  # remove this when a Kconfig knob is made available by upstream
+  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
+  patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
+
   if [ "${CARCH}" = "x86_64" ]; then
     cat "${srcdir}/config.x86_64" > ./.config
   else

Modified: change-default-console-loglevel.patch
===================================================================
--- change-default-console-loglevel.patch	2014-08-05 01:18:32 UTC (rev 219300)
+++ change-default-console-loglevel.patch	2014-08-05 04:41:14 UTC (rev 219301)
@@ -1,12 +1,11 @@
-diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
-@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
+--- linux-3.16/include/linux/printk.h.old	2014-08-04 18:48:30.686043266 +0200
++++ linux-3.16/include/linux/printk.h	2014-08-04 18:48:47.706218528 +0200
+@@ -37,7 +37,7 @@
+ #define CONSOLE_LOGLEVEL_SILENT  0 /* Mum's the word */
+ #define CONSOLE_LOGLEVEL_MIN	 1 /* Minimum loglevel we let people use */
+ #define CONSOLE_LOGLEVEL_QUIET	 4 /* Shhh ..., when booted with "quiet" */
+-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */
++#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */
+ #define CONSOLE_LOGLEVEL_DEBUG	10 /* issue debug messages */
+ #define CONSOLE_LOGLEVEL_MOTORMOUTH 15	/* You can't shut this one up */
  
- /* We show everything that is MORE important than this.. */
- #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
--#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
- 
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
-