Rename 'make_options' to 'kmake_opts'

The command-line option corresponding to the 'make_options' configuration knob
is called '--kmake-opts'. Let's be consistent and use the same names for both,
just to make things be more logical.

Alternatively, if 'kmake_opts' is not the best name, we could rename both to
'make_options' instead, or to something else.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/doc/email/example-aiaiai.cfg b/doc/email/example-aiaiai.cfg
index 3d26dff5a9e2e217a9aec427cb08bcaadb2d8623..4636e28bb4bcac65702e1d1043c7679fee5612a0 100644 (file)
--- a/doc/email/example-aiaiai.cfg
+++ b/doc/email/example-aiaiai.cfg
@@ -101,6 +101,6 @@
 
        # Additional kernel build options which are appended to the end of the
        # "make" command. For example, W=2 KALLSYMS_EXTRA_PASS=1.
-       make_options =
+       kmake_opts =
 
 # More "prj_xyz" sections may be added

diff --git a/email/aiaiai-email-sh-functions b/email/aiaiai-email-sh-functions
index 36c5564770a3721137d897a032a7d4a465517549..a26fc513c59e860ab3c69210b3dc33289aad20f1 100644 (file)
--- a/email/aiaiai-email-sh-functions
+++ b/email/aiaiai-email-sh-functions
@@ -162,7 +162,7 @@ parse_config()
 #
 # cfg_name. cfg_descr, cfg_path, cfg_configs, cfg_branch, cfg_reply_to_all,
 # cfg_accept_notify, cfg_always_cc, cfg_unwanted_keywords, and
-# cfg_make_options.
+# cfg_kmake_opts.
 #
 # If the project is not found, this function only defined an empty "cfg_name"
 # variable.
@@ -185,7 +185,7 @@ parse_prj_config()
 
        cfg_always_cc="$(ini_config_get "$cfgfile" "prj_$prj" "always_cc")"
        cfg_unwanted_keywords="$(ini_config_get "$cfgfile" ""prj_$prj"" "unwanted_keywords")"
-       cfg_make_options="$(ini_config_get "$cfgfile" "prj_$prj" "make_options")"
+       cfg_kmake_opts="$(ini_config_get "$cfgfile" "prj_$prj" "kmake_opts")"
 }
 
 # Compose (but not send) e-mail reply. This function assumes that the following

diff --git a/email/aiaiai-email-test-patchset b/email/aiaiai-email-test-patchset
index 97083b2cd9e3012c9fd02f1b16b6b6e02bffe0cc..31e434528aa8da90f94c3d37133aeff9fb24434e 100755 (executable)
--- a/email/aiaiai-email-test-patchset
+++ b/email/aiaiai-email-test-patchset
@@ -340,7 +340,7 @@ aiaiai-test-patchset $verbose $preserve $bisectability $sparse $smatch $cppcheck
        -i "$mbox" -j "$cfg_jobs" -c "$cfg_branch" -w "$tmpdir" \
        ${confdir:+-C "$confdir"} \
        ${cfg_unwanted_keywords:+-K "$cfg_unwanted_keywords"} -- \
-       ${cfg_make_options:+-M "$cfg_make_options"} \
+       ${cfg_kmake_opts:+-M "$cfg_kmake_opts"} \
        "$cfg_path" "$cfg_configs" > "$tmpdir/test-patchset.log" ||
 {
        verbose "aiaiai-test-patchset failed"