| Message ID | 20220623083105.26354-1-jslaby@suse.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild, link-vmlinux: Don't delete output files with make -i | expand |
On Thu, Jun 23, 2022 at 5:31 PM Jiri Slaby <jslaby@suse.cz> wrote: > > From: Andi Kleen <andi@firstfloor.org> > > make -i is useful to see output files which normally get deleted on an > error. Make this work with link-vmlinux.sh too. Don't delete the output > files on error when make -i is used. > > Cc: Masahiro Yamada <masahiroy@kernel.org> > Cc: Michal Marek <michal.lkml@markovi.net> > Cc: Nick Desaulniers <ndesaulniers@google.com> > Cc: linux-kbuild@vger.kernel.org > Signed-off-by: Andi Kleen <ak@linux.intel.com> > Signed-off-by: Jiri Slaby <jslaby@suse.cz> > --- I am afraid you missed this commit: commit 51eb95e2da41802454f48b9afeb4d96a77295035 Author: Andi Kleen <ak@linux.intel.com> Date: Tue May 4 20:35:27 2021 -0700 kbuild: Don't remove link-vmlinux temporary files on exit/signal Keep them around until they are cleaned up by make clean. This uses a bit more disk space, but makes it easier to debug any problems with the kernel link process. Suggested-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > scripts/link-vmlinux.sh | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh > index eecc1863e556..d21759aad4f3 100755 > --- a/scripts/link-vmlinux.sh > +++ b/scripts/link-vmlinux.sh > @@ -193,6 +193,11 @@ sorttable() > # Delete output files in case of error > cleanup() > { > + # don't delete for make -i > + case "$MFLAGS" in > + *-i*) return ;; > + esac > + > rm -f .btf.* > rm -f System.map > rm -f vmlinux > -- > 2.36.1 >
On 23. 06. 22, 11:45, Masahiro Yamada wrote: > On Thu, Jun 23, 2022 at 5:31 PM Jiri Slaby <jslaby@suse.cz> wrote: >> >> From: Andi Kleen <andi@firstfloor.org> >> >> make -i is useful to see output files which normally get deleted on an >> error. Make this work with link-vmlinux.sh too. Don't delete the output >> files on error when make -i is used. >> >> Cc: Masahiro Yamada <masahiroy@kernel.org> >> Cc: Michal Marek <michal.lkml@markovi.net> >> Cc: Nick Desaulniers <ndesaulniers@google.com> >> Cc: linux-kbuild@vger.kernel.org >> Signed-off-by: Andi Kleen <ak@linux.intel.com> >> Signed-off-by: Jiri Slaby <jslaby@suse.cz> >> --- > > > > I am afraid you missed this commit: > > > > commit 51eb95e2da41802454f48b9afeb4d96a77295035 > Author: Andi Kleen <ak@linux.intel.com> > Date: Tue May 4 20:35:27 2021 -0700 > > kbuild: Don't remove link-vmlinux temporary files on exit/signal Oops, thanks a lot for pointing out. We are going through the Andi's LTO patches and this went unnoticed as it was changed differently (and rebase succeeded). Now dropped from the queue. thanks,
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index eecc1863e556..d21759aad4f3 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -193,6 +193,11 @@ sorttable() # Delete output files in case of error cleanup() { + # don't delete for make -i + case "$MFLAGS" in + *-i*) return ;; + esac + rm -f .btf.* rm -f System.map rm -f vmlinux