scripts: checkversion: modernize linux/version.h search strings

Update scripts/checkversion.pl to recognize the current contents
of <linux/version.h> and both of its current locations.

Also update my email address.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Randy Dunlap 2021-07-26 19:57:37 -07:00 committed by Masahiro Yamada
parent 28bbbb9875
commit 54eacba0e3

View File

@ -1,10 +1,10 @@
#! /usr/bin/env perl #! /usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# #
# checkversion find uses of LINUX_VERSION_CODE or KERNEL_VERSION # checkversion finds uses of all macros in <linux/version.h>
# without including <linux/version.h>, or cases of # where the source files do not #include <linux/version.h>; or cases
# including <linux/version.h> that don't need it. # of including <linux/version.h> where it is not needed.
# Copyright (C) 2003, Randy Dunlap <rdunlap@xenotime.net> # Copyright (C) 2003, Randy Dunlap <rdunlap@infradead.org>
use strict; use strict;
@ -13,7 +13,8 @@ $| = 1;
my $debugging; my $debugging;
foreach my $file (@ARGV) { 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 this file.
open( my $f, '<', $file ) open( my $f, '<', $file )
or die "Can't open $file: $!\n"; 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; $iLinuxVersion = $. if m/^\s*#\s*include\s*<linux\/version\.h>/o;
} }
# Look for uses: LINUX_VERSION_CODE, KERNEL_VERSION, UTS_RELEASE # Look for uses: LINUX_VERSION_CODE, KERNEL_VERSION,
if (($_ =~ /LINUX_VERSION_CODE/) || ($_ =~ /\WKERNEL_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; $fUseVersion = 1;
last if $iLinuxVersion; last if $iLinuxVersion;
} }