Commit 4972bb90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.14-2' of... 

Merge tag 'kbuild-fixes-v5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Correct the Extended Regular Expressions in tools

 - Adjust scripts/checkversion.pl for the current Kbuild

 - Unset sub_make_done for 'make install' to make DKMS work again

* tag 'kbuild-fixes-v5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: cancel sub_make_done for the install target to fix DKMS
  scripts: checkversion: modernize linux/version.h search strings
  mips: Fix non-POSIX regexp
  x86/tools/relocs: Fix non-POSIX regexp
parents c9194f32 14ccc638

Makefile

+10 −0
Original line number Diff line number Diff line
@@ -1316,6 +1316,16 @@ PHONY += scripts_unifdef 
scripts_unifdef: scripts_basic

	$(Q)$(MAKE) $(build)=scripts scripts/unifdef



# ---------------------------------------------------------------------------

# Install



# Many distributions have the custom install script, /sbin/installkernel.

# If DKMS is installed, 'make install' will eventually recuses back

# to the this Makefile to build and install external modules.

# Cancel sub_make_done so that options such as M=, V=, etc. are parsed.



install: sub_make_done :=



# ---------------------------------------------------------------------------

# Tools

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ KBUILD_LDFLAGS += -m $(ld-emul) 


ifdef CONFIG_MIPS

CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \

	egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \

	egrep -vw '__GNUC_(MINOR_|PATCHLEVEL_)?_' | \

	sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g')

endif

arch/x86/tools/relocs.c

+4 −4
Original line number Diff line number Diff line
@@ -57,12 +57,12 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { 
	[S_REL] =

	"^(__init_(begin|end)|"

	"__x86_cpu_dev_(start|end)|"

	"(__parainstructions|__alt_instructions)(|_end)|"

	"(__iommu_table|__apicdrivers|__smp_locks)(|_end)|"

	"(__parainstructions|__alt_instructions)(_end)?|"

	"(__iommu_table|__apicdrivers|__smp_locks)(_end)?|"

	"__(start|end)_pci_.*|"

	"__(start|end)_builtin_fw|"

	"__(start|stop)___ksymtab(|_gpl)|"

	"__(start|stop)___kcrctab(|_gpl)|"

	"__(start|stop)___ksymtab(_gpl)?|"

	"__(start|stop)___kcrctab(_gpl)?|"

	"__(start|stop)___param|"

	"__(start|stop)___modver|"

	"__(start|stop)___bug_table|"

scripts/checkversion.pl

+11 −7
Original line number Diff line number Diff line 
#! /usr/bin/env perl

# SPDX-License-Identifier: GPL-2.0

#

# checkversion find uses of LINUX_VERSION_CODE or KERNEL_VERSION

# without including <linux/version.h>, or cases of

# including <linux/version.h> that don't need it.

# Copyright (C) 2003, Randy Dunlap <rdunlap@xenotime.net>

# checkversion finds uses of all macros in <linux/version.h>

# where the source files do not #include <linux/version.h>; or cases

# of including <linux/version.h> where it is not needed.

# Copyright (C) 2003, Randy Dunlap <rdunlap@infradead.org>



use strict;
@@ -13,7 +13,8 @@ $| = 1; 
my $debugging;



foreach my $file (@ARGV) {

    next if $file =~ "include/linux/version\.h";

    next if $file =~ "include/generated/uapi/linux/version\.h";

    next if $file =~ "usr/include/linux/version\.h";

    # Open this file.

    open( my $f, '<', $file )

      or die "Can't open $file: $!\n";
@@ -41,8 +42,11 @@ foreach my $file (@ARGV) { 
	    $iLinuxVersion      = $. if m/^\s*#\s*include\s*<linux\/version\.h>/o;

	}



	# Look for uses: LINUX_VERSION_CODE, KERNEL_VERSION, UTS_RELEASE

	if (($_ =~ /LINUX_VERSION_CODE/) || ($_ =~ /\WKERNEL_VERSION/)) {

	# Look for uses: LINUX_VERSION_CODE, KERNEL_VERSION,

	# LINUX_VERSION_MAJOR, LINUX_VERSION_PATCHLEVEL, LINUX_VERSION_SUBLEVEL

	if (($_ =~ /LINUX_VERSION_CODE/) || ($_ =~ /\WKERNEL_VERSION/) ||

	    ($_ =~ /LINUX_VERSION_MAJOR/) || ($_ =~ /LINUX_VERSION_PATCHLEVEL/) ||

	    ($_ =~ /LINUX_VERSION_SUBLEVEL/)) {

	    $fUseVersion = 1;

            last if $iLinuxVersion;

        }