kconfig: test if a .config already exists
authorSteven Rostedt <srostedt@redhat.com>
Thu, 7 May 2009 15:09:55 +0000 (11:09 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Wed, 19 Aug 2009 02:15:55 +0000 (22:15 -0400)
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

index 12a4d9e..915a39a 100644 (file)
@@ -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