lkml.org 
[lkml]   [2009]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 14/14] kconfig: test if a .config already exists
    From: Steven Rostedt <srostedt@redhat.com>

    If one were to run localmodconfig or localyesconfig without having
    a .config already in the file, then the end of the process would give
    a warning when it tries to move the old .config to .config.old.

    This patch adds a test to check if .config exists and avoid the moves
    if it does not.

    [ Impact: remove warning after make localmodconfig ]

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    scripts/kconfig/Makefile | 30 ++++++++++++++++++++----------
    1 files changed, 20 insertions(+), 10 deletions(-)

    diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
    index 12a4d9e..915a39a 100644
    --- a/scripts/kconfig/Makefile
    +++ b/scripts/kconfig/Makefile
    @@ -31,21 +31,31 @@ silentoldconfig: $(obj)/conf

    localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
    $(Q)perl $< $(Kconfig) > .tmp.config
    - $(Q)cmp -s .tmp.config .config || \
    - (mv -f .config .config.old.1; \
    - mv -f .tmp.config .config; \
    - $(obj)/conf -s $(Kconfig); \
    - mv -f .config.old.1 .config.old)
    + $(Q)if [ -f .config ]; then \
    + cmp -s .tmp.config .config || \
    + (mv -f .config .config.old.1; \
    + mv -f .tmp.config .config; \
    + $(obj)/conf -s $(Kconfig); \
    + mv -f .config.old.1 .config.old) \
    + else \
    + mv -f .tmp.config .config; \
    + $(obj)/conf -s $(Kconfig); \
    + fi
    $(Q)rm -f .tmp.config

    localyesconfig: $(obj)/streamline_config.pl
    $(Q)perl $< $(Kconfig) > .tmp.config
    $(Q)sed -i s/=m/=y/ .tmp.config
    - $(Q)cmp -s .tmp.config .config || \
    - (mv -f .config .config.old.1; \
    - mv -f .tmp.config .config; \
    - $(obj)/conf -s $(Kconfig); \
    - mv -f .config.old.1 .config.old)
    + $(Q)if [ -f .config ]; then \
    + cmp -s .tmp.config .config || \
    + (mv -f .config .config.old.1; \
    + mv -f .tmp.config .config; \
    + $(obj)/conf -s $(Kconfig); \
    + mv -f .config.old.1 .config.old) \
    + else \
    + mv -f .tmp.config .config; \
    + $(obj)/conf -s $(Kconfig); \
    + fi
    $(Q)rm -f .tmp.config

    # Create new linux.pot file
    --
    1.6.3.3
    --


    \
     
     \ /
      Last update: 2009-08-19 05:07    [W:0.023 / U:30.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site