Merge tag 'kbuild-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[sfrench/cifs-2.6.git] / scripts / link-vmlinux.sh

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index e6818b8e7141e6b9e021d8e781cb94b09293ef1a..c0d129d7f4304abfac7f2e7d699000df02678f73 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -188,10 +188,8 @@ sortextable()
 # Delete output files in case of error
 cleanup()
 {
-       rm -f .old_version
        rm -f .tmp_System.map
        rm -f .tmp_kallsyms*
-       rm -f .tmp_version
        rm -f .tmp_vmlinux*
        rm -f built-in.o
        rm -f System.map
@@ -239,12 +237,12 @@ esac
 
 # Update version
 info GEN .version
-if [ ! -r .version ]; then
-       rm -f .version;
-       echo 1 >.version;
+if [ -r .version ]; then
+       VERSION=$(expr 0$(cat .version) + 1)
+       echo $VERSION > .version
 else
-       mv .version .old_version;
-       expr 0$(cat .old_version) + 1 >.version;
+       rm -f .version
+       echo 1 > .version
 fi;
 
 # final build of init/
@@ -332,6 +330,3 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
                exit 1
        fi
 fi
-
-# We made a new kernel - delete old version file
-rm -f .old_version