[PATCH aiaiai 9/9] aiaiai: don't hardcode KCFLAGS or W=1

[Jacob Keller]

This patch fixes the TODO item regarding hardcoded kernel make
parameters. We now default -M to be "KCFLAGS='-Wno-missing-initializers
-Wno-sign-compare' W=1", and allow redefining the option via the email
configuration line or the command line setting for aiaiai-test-patchset

Signed-off-by: Jacob Keller <jacob.e.keller at intel.com>
---
 doc/TODO.txt                 | 4 ----
 doc/email/example-aiaiai.cfg | 4 ++--
 helpers/aiaiai-make-kernel   | 9 +++++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/doc/TODO.txt b/doc/TODO.txt
index 5d7a41e16b7e..b46dac5ebaf3 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -34,7 +34,3 @@ implementing them.
       int found;
           ^
     Aiaiai does not process them correctly which leads to ugly diffs. Fix this.
-  * We hard-code 'KCFLAGS='-Wno-missing-field-initializers
-    -Wno-sign-compare' and W=1 in 'aiaiai-make-kernel'. This is not that
-    nice. It is better to make these things to be the default value of
-    the -M parameter. The users could disable them or re-define easily.
diff --git a/doc/email/example-aiaiai.cfg b/doc/email/example-aiaiai.cfg
index 43d9a47bf310..e9f7585769d4 100644
--- a/doc/email/example-aiaiai.cfg
+++ b/doc/email/example-aiaiai.cfg
@@ -107,7 +107,7 @@
 
 	# Additional kernel build options which are appended to the end of the
 	# "make" command. For example, W=2 KALLSYMS_EXTRA_PASS=1.
-	kmake_opts =
+	kmake_opts = KCFLAGS='-Wno-missing-field-initializers -Wno-sign-compare' W=1
 
 	# List of targets (space seperated) for which to run a kernel make.
 	# Leaving this empty will default to "all" as the only target. However,
@@ -183,6 +183,6 @@
 	reply_to_all = 1
 	accept_notify = 1
 	unwanted_keywords =
-	kmake_opts = W=2 KALLSYMS_EXTRA_PASS=1
+	kmake_opts = W=12 KALLSYMS_EXTRA_PASS=1 KCFLAGS='-Wno-missing-initializers -Wno-sign-compare'
 
 # More "prj_xyz" sections may be added
diff --git a/helpers/aiaiai-make-kernel b/helpers/aiaiai-make-kernel
index 934d88b24b94..4338a2764a09 100755
--- a/helpers/aiaiai-make-kernel
+++ b/helpers/aiaiai-make-kernel
@@ -58,7 +58,9 @@ Options:
       --check-only=FILE  check only files listed in FILE;
   -M, --kmake-opts       additional options to append to the final kernel
                          compilation 'make' command
-                         (e.g., W=2 KALLSYMS_EXTRA_PASS=1)
+                         (e.g., W=12 KALLSYMS_EXTRA_PASS=1)
+                         defaults to "KCFLAGS='-Wno-missing-field-initializers
+                          -Wno-sign-compare' W=1"
   -v, --verbose          be verbose;
   -h, --help             show this text and exit.
 EOF
@@ -118,8 +120,7 @@ make_target()
 		"make $keep_going -j $jobs -C $kernel_tree ${arch:+ARCH="$arch"} \
 		${cross:+CROSS_COMPILE="$cross"} ${objdir:+O="$objdir"} \
 		CHECK=\"aiaiai-checker $sparse $smatch $cppcheck $coccinelle $check_only --\" \
-		KCFLAGS='-Wno-missing-field-initializers -Wno-sign-compare' \
-		C=$check ${check:+CF="-D__CHECK_ENDIAN__"} W=1 SHELL=\"aiaiai-locker $split -l $lockfile\" \
+		C=$check ${check:+CF="-D__CHECK_ENDIAN__"} SHELL=\"aiaiai-locker $split -l $lockfile\" \
 		$kmake_opts $target"
 }
 
@@ -155,7 +156,7 @@ coccinelle=
 cocci_path=
 check_only=
 check=0
-kmake_opts=
+kmake_opts="KCFLAGS='-Wno-missing-field-initializers -Wno-sign-compare' W=1"
 verbose=
 
 while true; do
-- 
1.8.3.1