| Message ID | 168b2cb09f09ec3cead8a6b1e726ac76f5d06171.1733820553.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kbuild: Drop architecture argument from headers_check.pl | expand |
On Tue, Dec 10, 2024 at 5:52 PM Geert Uytterhoeven <geert+renesas@glider.be> wrote: > > Since commit 7ff0fd4a9e20cf73 ("kbuild: drop support for This is not a fixed commit hash because Andrew Morton does not use 'git request-pull' I will squash this to the original patch. > include/asm-<arch> in headers_check.pl"), the second argument $arch is > no longer used, hence drop it. > > Reported-by: Masahiro Yamada <masahiroy@kernel.org> > Closes: https://lore.kernel.org/CAK7LNARNa3NPSeRAUgMaEqWiA+C6-s1PxRe1bCUJg6zLyOtDkA@mail.gmail.com > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Commit 7ff0fd4a9e20cf73 is part of the mm tree. > > usr/include/Makefile | 2 +- > usr/include/headers_check.pl | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/usr/include/Makefile b/usr/include/Makefile > index 771e32872b2ab12d..6c6de1b1622b1a69 100644 > --- a/usr/include/Makefile > +++ b/usr/include/Makefile > @@ -78,7 +78,7 @@ quiet_cmd_hdrtest = HDRTEST $< > cmd_hdrtest = \ > $(CC) $(c_flags) -fsyntax-only -x c /dev/null \ > $(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \ > - $(PERL) $(src)/headers_check.pl $(obj) $(SRCARCH) $<; \ > + $(PERL) $(src)/headers_check.pl $(obj) $<; \ > touch $@ > > $(obj)/%.hdrtest: $(obj)/%.h FORCE > diff --git a/usr/include/headers_check.pl b/usr/include/headers_check.pl > index 7070c891ea294b4d..2b70bfa5558e6451 100755 > --- a/usr/include/headers_check.pl > +++ b/usr/include/headers_check.pl > @@ -3,9 +3,8 @@ > # > # headers_check.pl execute a number of trivial consistency checks > # > -# Usage: headers_check.pl dir arch [files...] > +# Usage: headers_check.pl dir [files...] > # dir: dir to look for included files > -# arch: architecture > # files: list of files to check > # > # The script reads the supplied files line by line and: > @@ -23,7 +22,7 @@ use warnings; > use strict; > use File::Basename; > > -my ($dir, $arch, @files) = @ARGV; > +my ($dir, @files) = @ARGV; > > my $ret = 0; > my $line; > -- > 2.34.1 >
Hi Yamada-san, On Tue, Dec 10, 2024 at 11:14 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > On Tue, Dec 10, 2024 at 5:52 PM Geert Uytterhoeven > <geert+renesas@glider.be> wrote: > > > > Since commit 7ff0fd4a9e20cf73 ("kbuild: drop support for > > This is not a fixed commit hash because Andrew Morton > does not use 'git request-pull' > > I will squash this to the original patch. Thank you! Gr{oetje,eeting}s, Geert
Hi Geert,
kernel test robot noticed the following build errors:
[auto build test ERROR on masahiroy-kbuild/for-next]
[also build test ERROR on linus/master v6.13-rc3]
[cannot apply to next-20241219]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Geert-Uytterhoeven/kbuild-Drop-architecture-argument-from-headers_check-pl/20241210-165347
base: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git for-next
patch link: https://lore.kernel.org/r/168b2cb09f09ec3cead8a6b1e726ac76f5d06171.1733820553.git.geert%2Brenesas%40glider.be
patch subject: [PATCH] kbuild: Drop architecture argument from headers_check.pl
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241220/202412201643.PR8VVmEL-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202412201643.PR8VVmEL-lkp@intel.com/
All errors (new ones prefixed by >>):
make[1]: Circular tools/testing/selftests/alsa/global-timer <- tools/testing/selftests/alsa/global-timer dependency dropped.
Makefile:60: warning: overriding recipe for target 'emit_tests'
../lib.mk:182: warning: ignoring old recipe for target 'emit_tests'
make[1]: *** No targets. Stop.
>> Makefile:47: *** Cannot find a vmlinux for VMLINUX_BTF at any of " ../../../../vmlinux /sys/kernel/btf/vmlinux /boot/vmlinux-5.9.0-2-amd64". Stop.
make[1]: *** No targets. Stop.
make[1]: *** No targets. Stop.
vim +47 Makefile
3812b8c5c5d527 Masahiro Yamada 2019-02-22 46
3812b8c5c5d527 Masahiro Yamada 2019-02-22 @47 # Do not use make's built-in rules and variables
3812b8c5c5d527 Masahiro Yamada 2019-02-22 48 # (this increases performance and avoids hard-to-debug behaviour)
3812b8c5c5d527 Masahiro Yamada 2019-02-22 49 MAKEFLAGS += -rR
3812b8c5c5d527 Masahiro Yamada 2019-02-22 50
On Fri, Dec 20, 2024 at 5:21 PM kernel test robot <lkp@intel.com> wrote: > > Hi Geert, > > kernel test robot noticed the following build errors: > > [auto build test ERROR on masahiroy-kbuild/for-next] > [also build test ERROR on linus/master v6.13-rc3] > [cannot apply to next-20241219] > [If your patch is applied to the wrong git tree, kindly drop us a note. This patch was applied to the wrong base. e818f927cd01 (HEAD, origin/Geert-Uytterhoeven/kbuild-Drop-architecture-argument-from-headers_check-pl/20241210-165347) kbuild: Drop architecture argument from headers_check.pl f2dc1ed2104b kbuild: deb-pkg: add debarch for ARCH=um b493dc6aab8a kbuild: deb-pkg: allow hooks also in /usr/share/kernel e9bd8e4b7712 kbuild: deb-pkg: do not include empty hook directories fac04efc5c79 Linux 6.13-rc2
diff --git a/usr/include/Makefile b/usr/include/Makefile index 771e32872b2ab12d..6c6de1b1622b1a69 100644 --- a/usr/include/Makefile +++ b/usr/include/Makefile @@ -78,7 +78,7 @@ quiet_cmd_hdrtest = HDRTEST $< cmd_hdrtest = \ $(CC) $(c_flags) -fsyntax-only -x c /dev/null \ $(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \ - $(PERL) $(src)/headers_check.pl $(obj) $(SRCARCH) $<; \ + $(PERL) $(src)/headers_check.pl $(obj) $<; \ touch $@ $(obj)/%.hdrtest: $(obj)/%.h FORCE diff --git a/usr/include/headers_check.pl b/usr/include/headers_check.pl index 7070c891ea294b4d..2b70bfa5558e6451 100755 --- a/usr/include/headers_check.pl +++ b/usr/include/headers_check.pl @@ -3,9 +3,8 @@ # # headers_check.pl execute a number of trivial consistency checks # -# Usage: headers_check.pl dir arch [files...] +# Usage: headers_check.pl dir [files...] # dir: dir to look for included files -# arch: architecture # files: list of files to check # # The script reads the supplied files line by line and: @@ -23,7 +22,7 @@ use warnings; use strict; use File::Basename; -my ($dir, $arch, @files) = @ARGV; +my ($dir, @files) = @ARGV; my $ret = 0; my $line;
Since commit 7ff0fd4a9e20cf73 ("kbuild: drop support for include/asm-<arch> in headers_check.pl"), the second argument $arch is no longer used, hence drop it. Reported-by: Masahiro Yamada <masahiroy@kernel.org> Closes: https://lore.kernel.org/CAK7LNARNa3NPSeRAUgMaEqWiA+C6-s1PxRe1bCUJg6zLyOtDkA@mail.gmail.com Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Commit 7ff0fd4a9e20cf73 is part of the mm tree. usr/include/Makefile | 2 +- usr/include/headers_check.pl | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)