• M
    kbuild: mergeconfig: move an error check to merge_config.sh · b9fe99c5
    Masahiro Yamada 提交于
    Currently, "make tinyconfig" does not work with "-j" option.
    
      $ make mrproper
      $ make -j8 tinyconfig
        HOSTCC  scripts/basic/fixdep
        HOSTCC  scripts/kconfig/conf.o
        SHIPPED scripts/kconfig/zconf.tab.c
        SHIPPED scripts/kconfig/zconf.lex.c
        SHIPPED scripts/kconfig/zconf.hash.c
        HOSTCC  scripts/kconfig/zconf.tab.o
        HOSTLD  scripts/kconfig/conf
      scripts/kconfig/conf --allnoconfig Kconfig
      #
      # configuration written to .config
      #
      scripts/kconfig/Makefile:122: *** You need an existing .config
      for this target.  Stop.
      make: *** [tinyconfig] Error 2
    
    As shown above, "allnoconfig" has created the .config file before
    mergeconfig is called, but Make still raises a false alarm because
    of some sort of race condition.
    
    We can fix this issue by moving the error check to the shell script.
    
    Anyway, scripts/kconfig/merge_config.sh always requires an existing
    .config as a base file.  It is reasonable to check its existence in
    the shell script.
    Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
    Reviewed-by: NJosh Triplett <josh@joshtriplett.org>
    Reviewed-by: NDarren Hart <dvhart@linux.intel.com>
    Signed-off-by: NMichal Marek <mmarek@suse.cz>
    b9fe99c5
Makefile 11.5 KB