lkml.org 
[lkml]   [2012]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/4] localmodconfig: Comments and cleanup for streamline_config.pl
    From: Steven Rostedt <srostedt@redhat.com>

    Added some more comments and cleaned up part of the the code to use
    a named variable instead of one of the special $1 perl variables.

    No functional changes.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    scripts/kconfig/streamline_config.pl | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
    index bccf07dd..5c1ce87 100644
    --- a/scripts/kconfig/streamline_config.pl
    +++ b/scripts/kconfig/streamline_config.pl
    @@ -186,6 +186,7 @@ sub read_kconfig {
    $state = "NEW";
    $config = $2;

    + # Add depends for 'if' nesting
    for (my $i = 0; $i < $iflevel; $i++) {
    if ($i) {
    $depends{$config} .= " " . $ifdeps[$i];
    @@ -204,10 +205,11 @@ sub read_kconfig {

    # Get the configs that select this config
    } elsif ($state ne "NONE" && /^\s*select\s+(\S+)/) {
    - if (defined($selects{$1})) {
    - $selects{$1} .= " " . $config;
    + my $conf = $1;
    + if (defined($selects{$conf})) {
    + $selects{$conf} .= " " . $config;
    } else {
    - $selects{$1} = $config;
    + $selects{$conf} = $config;
    }

    # configs without prompts must be selected
    @@ -250,6 +252,7 @@ if ($kconfig) {
    read_kconfig($kconfig);
    }

    +# Makefiles can use variables to define their dependencies
    sub convert_vars {
    my ($line, %vars) = @_;

    @@ -293,6 +296,7 @@ foreach my $makefile (@makefiles) {

    my $objs;

    + # Convert variables in a line (could define configs)
    $_ = convert_vars($_, %make_vars);

    # collect objects after obj-$(CONFIG_FOO_BAR)
    @@ -373,7 +377,8 @@ while (<LIN>) {
    close (LIN);

    # add to the configs hash all configs that are needed to enable
    -# a loaded module.
    +# a loaded module. This is a direct obj-${CONFIG_FOO} += bar.o
    +# where we know we need bar.o so we add FOO to the list.
    my %configs;
    foreach my $module (keys(%modules)) {
    if (defined($objects{$module})) {
    --
    1.7.10

    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-06-20 05:21    [W:0.025 / U:1.708 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site