| Message ID | 20200210200634.950-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild: fix mismatch between .version and include/generated/compile.h | expand |
On Tue, Feb 11, 2020 at 5:06 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > Since commit 56d589361572 ("kbuild: do not create orphan built-in.a or > obj-y objects"), scripts/link-vmlinux.sh does nothing when descending > into init/. > > Once the version number becomes out of sync between .version and > include/generated/compile.h, it is not self-healing. > > [How to reproduce] > > $ echo 100 > .version > $ make > > You will see the number in the .version is always bigger than that in > compile.h by one. After this, every time you run 'make', the vmlinux is > re-linked even when none of source files is updated. > > Fixes: 56d589361572 ("kbuild: do not create orphan built-in.a or obj-y objects") > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- Applied. > scripts/link-vmlinux.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh > index 1919c311c149..dd484e92752e 100755 > --- a/scripts/link-vmlinux.sh > +++ b/scripts/link-vmlinux.sh > @@ -239,7 +239,7 @@ else > fi; > > # final build of init/ > -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init > +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init need-builtin=1 > > #link vmlinux.o > info LD vmlinux.o > -- > 2.17.1 >
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 1919c311c149..dd484e92752e 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -239,7 +239,7 @@ else fi; # final build of init/ -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init need-builtin=1 #link vmlinux.o info LD vmlinux.o
Since commit 56d589361572 ("kbuild: do not create orphan built-in.a or obj-y objects"), scripts/link-vmlinux.sh does nothing when descending into init/. Once the version number becomes out of sync between .version and include/generated/compile.h, it is not self-healing. [How to reproduce] $ echo 100 > .version $ make You will see the number in the .version is always bigger than that in compile.h by one. After this, every time you run 'make', the vmlinux is re-linked even when none of source files is updated. Fixes: 56d589361572 ("kbuild: do not create orphan built-in.a or obj-y objects") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/link-vmlinux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)