Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278ae604 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: link-vmlinux.sh: simplify .version increment 



Since commit 1f2bfbd0 ("kbuild: link of vmlinux moved to a
script"), it is easy to increment .version without using a temporary
file .old_version.

I do not see anybody who creates the .tmp_version.  Probably it is a
left-over of commit 4e25d8bb ("[PATCH] kbuild: adjust .version
updating").  Just remove it.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent f231e433

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ CLEAN_DIRS += $(MODVERDIR) 
# Directories & files removed with 'make mrproper'

MRPROPER_DIRS  += include/config usr/include include/generated          \

		  arch/*/include/generated .tmp_objdiff

MRPROPER_FILES += .config .config.old .version .old_version \

MRPROPER_FILES += .config .config.old .version \

		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \

		  signing_key.pem signing_key.priv signing_key.x509	\

		  x509.genkey extra_certificates signing_key.x509.keyid	\

scripts/link-vmlinux.sh

+5 −10
Original line number Diff line number Diff line
@@ -187,10 +187,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
@@ -238,12 +236,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/
@@ -331,6 +329,3 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then 
		exit 1

	fi

fi
 


# We made a new kernel - delete old version file

rm -f .old_version