lkml.org 
[lkml]   [2015]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/10] merge_config.sh: factor out value parsing
    Date
    Since we want to adjust the line later on to deal with CONFIG_FOO=n,
    let's make a function for it so we have only one place to change it in.

    Signed-off-by: Olof Johansson <olof@lixom.net>
    ---
    scripts/kconfig/merge_config.sh | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
    index ec8e203..430d002 100755
    --- a/scripts/kconfig/merge_config.sh
    +++ b/scripts/kconfig/merge_config.sh
    @@ -35,6 +35,10 @@ usage() {
    echo " -O dir to put generated output files"
    }

    +getval() {
    + grep -w -e "$1" "$2"
    +}
    +
    RUNMAKE=true
    ALLTARGET=alldefconfig
    WARNREDUN=false
    @@ -104,8 +108,8 @@ for MERGE_FILE in $MERGE_LIST ; do

    for CFG in $CFG_LIST ; do
    grep -q -w $CFG $TMP_FILE || continue
    - PREV_VAL=$(grep -w $CFG $TMP_FILE)
    - NEW_VAL=$(grep -w $CFG $MERGE_FILE)
    + PREV_VAL=$(getval "$CFG" "$TMP_FILE")
    + NEW_VAL=$(getval "$CFG" "$MERGE_FILE")
    if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
    echo Value of $CFG is redefined by fragment $MERGE_FILE:
    echo Previous value: $PREV_VAL
    @@ -145,8 +149,8 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
    # Check all specified config values took (might have missed-dependency issues)
    for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do

    - REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
    - ACTUAL_VAL=$(grep -w -e "$CFG" $OUTPUT/.config)
    + REQUESTED_VAL=$(getval "$CFG" "$TMP_FILE")
    + ACTUAL_VAL=$(getval "$CFG" "$OUTPUT/.config")
    if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
    echo "Value requested for $CFG not in final .config"
    echo "Requested value: $REQUESTED_VAL"
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2015-05-21 00:21    [W:2.248 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site