15 Jan, 2012

4 commits

  • Arnaud Lacombe pointed out the final checking that the requested configs
    were included in the final .config was broken.

    The example was that if you had a fragment that disabled
    CONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no
    final warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final
    .config.

    This bug was introduced by me in v3 of the original patch, and the
    following patch reverts the invalid change.

    Signed-off-by: John Stultz
    Reported-by: Arnaud Lacombe
    Cc: Darren Hart
    Cc: Michal Marek
    Cc: Arnaud Lacombe
    Signed-off-by: Andrew Morton
    Signed-off-by: Michal Marek

    John Stultz
     
  • Fix whitespace usage in the clean_up routine.

    Signed-off-by: Darren Hart
    Acked-by: John Stultz
    Cc: Michal Marek
    Signed-off-by: Andrew Morton
    Signed-off-by: Michal Marek

    Darren Hart
     
  • The SIGHUP SIGINT and SIGTERM names caused failures when running
    merge_config.sh with the dash shell. Dropping the "SIG" component makes
    the script work in both bash and dash.

    Signed-off-by: Darren Hart
    Acked-by: John Stultz
    Cc: Michal Marek
    Signed-off-by: Andrew Morton
    Signed-off-by: Michal Marek

    Darren Hart
     
  • After noticing almost every distro has their own method of managing config
    fragments, I went looking at some best practices, and wanted to try to
    consolidate some of the different approaches so this fairly simple
    infrastructure can be shared (and new distros/build systems don't have to
    implement yet another config fragment merge script).

    This script is most influenced by the Windriver tools used in the Yocto
    Project, reusing some portions found there.

    This script merges multiple config fragments, warning on any overridden
    values. It then sets any unspecified values to their default, then
    finally checks to make sure no specified value was dropped due to
    unsatisfied dependencies.

    I'm sure this implementation won't work for everyone, and I expect it will
    need to evolve to adapt for various use cases. But I think its a
    reasonable starting point.

    Cc: Sam Ravnborg
    Cc: Greg Thelen
    Cc: Reinhard Tartler
    Cc: Dmitry Fink
    Cc: Darren Hart
    Cc: Eric B Munson
    Cc: Bruce Ashfield
    Cc: Michal Marek
    Signed-off-by: John Stultz
    Signed-off-by: Andrew Morton
    Signed-off-by: Michal Marek

    john stultz