aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-07 18:09:09 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-07 18:09:09 -0400
commit16ffc4c39415e62c1d027d1bc59ee28e267d59f2 (patch)
tree6b341d1856c8b39b1de8af230f73d138db647848
parent58f051fc9828709e6c55803510761413d92c4e57 (diff)
parent9e6e0d5f2a2713402cf9dce69b9f9b516e4185d2 (diff)
Merge tag 'kbuild-misc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull misc Kbuild updates from Masahiro Yamada: - Use more portable shebang for Perl scripts - Remove trailing spaces from GCC version in kernel log - Make initramfs generation deterministic * tag 'kbuild-misc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: create deterministic initramfs directory listings scripts/mkcompile_h: Remove trailing spaces from compiler version scripts: Switch to more portable Perl shebang
-rwxr-xr-xscripts/bootgraph.pl2
-rwxr-xr-xscripts/checkincludes.pl2
-rwxr-xr-xscripts/checkpatch.pl3
-rwxr-xr-xscripts/checkstack.pl2
-rwxr-xr-xscripts/checkversion.pl2
-rwxr-xr-xscripts/cleanfile3
-rwxr-xr-xscripts/cleanpatch3
-rwxr-xr-xscripts/dtc/dt_to_config2
-rwxr-xr-xscripts/export_report.pl3
-rwxr-xr-xscripts/extract-module-sig.pl3
-rwxr-xr-xscripts/extract-sys-certs.pl3
-rwxr-xr-xscripts/extract_xc3028.pl2
-rwxr-xr-xscripts/gen_initramfs_list.sh2
-rwxr-xr-xscripts/get_dvb_firmware2
-rwxr-xr-xscripts/get_maintainer.pl3
-rwxr-xr-xscripts/headerdep.pl2
-rwxr-xr-xscripts/headers_check.pl3
-rwxr-xr-xscripts/kconfig/streamline_config.pl3
-rwxr-xr-xscripts/kernel-doc3
-rwxr-xr-xscripts/markup_oops.pl2
-rwxr-xr-xscripts/mkcompile_h2
-rwxr-xr-xscripts/namespace.pl4
-rwxr-xr-xscripts/profile2linkerlist.pl2
-rwxr-xr-xscripts/recordmcount.pl3
-rwxr-xr-xscripts/stackdelta2
25 files changed, 37 insertions, 26 deletions
diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
index 9ca667bcaee9..594c55541b16 100755
--- a/scripts/bootgraph.pl
+++ b/scripts/bootgraph.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2 2
3# Copyright 2008, Intel Corporation 3# Copyright 2008, Intel Corporation
4# 4#
diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
index 381c018a4612..ce9edefd6e0b 100755
--- a/scripts/checkincludes.pl
+++ b/scripts/checkincludes.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2# 2#
3# checkincludes: find/remove files included more than once 3# checkincludes: find/remove files included more than once
4# 4#
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 57e7daa2bdf9..3a225d078e75 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# (c) 2001, Dave Jones. (the file handling bit) 2# (c) 2001, Dave Jones. (the file handling bit)
3# (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit) 3# (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
4# (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite) 4# (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
@@ -6,6 +6,7 @@
6# Licensed under the terms of the GNU GPL License version 2 6# Licensed under the terms of the GNU GPL License version 2
7 7
8use strict; 8use strict;
9use warnings;
9use POSIX; 10use POSIX;
10use File::Basename; 11use File::Basename;
11use Cwd 'abs_path'; 12use Cwd 'abs_path';
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 9d37aa4faf5c..7f4c41717e26 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2 2
3# Check the stack usage of functions 3# Check the stack usage of functions
4# 4#
diff --git a/scripts/checkversion.pl b/scripts/checkversion.pl
index 5e490a8ceca5..8b4f205234b5 100755
--- a/scripts/checkversion.pl
+++ b/scripts/checkversion.pl
@@ -1,4 +1,4 @@
1#! /usr/bin/perl 1#! /usr/bin/env perl
2# 2#
3# checkversion find uses of LINUX_VERSION_CODE or KERNEL_VERSION 3# checkversion find uses of LINUX_VERSION_CODE or KERNEL_VERSION
4# without including <linux/version.h>, or cases of 4# without including <linux/version.h>, or cases of
diff --git a/scripts/cleanfile b/scripts/cleanfile
index cefd29e52298..72e3755327ae 100755
--- a/scripts/cleanfile
+++ b/scripts/cleanfile
@@ -1,9 +1,10 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# 2#
3# Clean a text file -- or directory of text files -- of stealth whitespace. 3# Clean a text file -- or directory of text files -- of stealth whitespace.
4# WARNING: this can be a highly destructive operation. Use with caution. 4# WARNING: this can be a highly destructive operation. Use with caution.
5# 5#
6 6
7use warnings;
7use bytes; 8use bytes;
8use File::Basename; 9use File::Basename;
9 10
diff --git a/scripts/cleanpatch b/scripts/cleanpatch
index 9680d03ad2b8..3e5a2303dc0e 100755
--- a/scripts/cleanpatch
+++ b/scripts/cleanpatch
@@ -1,9 +1,10 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# 2#
3# Clean a patch file -- or directory of patch files -- of stealth whitespace. 3# Clean a patch file -- or directory of patch files -- of stealth whitespace.
4# WARNING: this can be a highly destructive operation. Use with caution. 4# WARNING: this can be a highly destructive operation. Use with caution.
5# 5#
6 6
7use warnings;
7use bytes; 8use bytes;
8use File::Basename; 9use File::Basename;
9 10
diff --git a/scripts/dtc/dt_to_config b/scripts/dtc/dt_to_config
index 9a248b505c58..5dfd1bff351f 100755
--- a/scripts/dtc/dt_to_config
+++ b/scripts/dtc/dt_to_config
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2 2
3# Copyright 2016 by Frank Rowand 3# Copyright 2016 by Frank Rowand
4# Copyright 2016 by Gaurav Minocha 4# Copyright 2016 by Gaurav Minocha
diff --git a/scripts/export_report.pl b/scripts/export_report.pl
index 8f79b701de87..68ff426b347c 100755
--- a/scripts/export_report.pl
+++ b/scripts/export_report.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# 2#
3# (C) Copyright IBM Corporation 2006. 3# (C) Copyright IBM Corporation 2006.
4# Released under GPL v2. 4# Released under GPL v2.
@@ -7,6 +7,7 @@
7# Usage: export_report.pl -k Module.symvers [-o report_file ] -f *.mod.c 7# Usage: export_report.pl -k Module.symvers [-o report_file ] -f *.mod.c
8# 8#
9 9
10use warnings;
10use Getopt::Std; 11use Getopt::Std;
11use strict; 12use strict;
12 13
diff --git a/scripts/extract-module-sig.pl b/scripts/extract-module-sig.pl
index faac6f2e377f..0f161ea41261 100755
--- a/scripts/extract-module-sig.pl
+++ b/scripts/extract-module-sig.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# 2#
3# extract-mod-sig <part> <module-file> 3# extract-mod-sig <part> <module-file>
4# 4#
@@ -12,6 +12,7 @@
12# -k: Just the key ID 12# -k: Just the key ID
13# -s: Just the crypto signature or PKCS#7 message 13# -s: Just the crypto signature or PKCS#7 message
14# 14#
15use warnings;
15use strict; 16use strict;
16 17
17die "Format: $0 -[0adnks] module-file >out\n" 18die "Format: $0 -[0adnks] module-file >out\n"
diff --git a/scripts/extract-sys-certs.pl b/scripts/extract-sys-certs.pl
index 8227ca10a494..2aa873b944e0 100755
--- a/scripts/extract-sys-certs.pl
+++ b/scripts/extract-sys-certs.pl
@@ -1,5 +1,6 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# 2#
3use warnings;
3use strict; 4use strict;
4use Math::BigInt; 5use Math::BigInt;
5use Fcntl "SEEK_SET"; 6use Fcntl "SEEK_SET";
diff --git a/scripts/extract_xc3028.pl b/scripts/extract_xc3028.pl
index 47877deae6d7..61d9b256c658 100755
--- a/scripts/extract_xc3028.pl
+++ b/scripts/extract_xc3028.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2 2
3# Copyright (c) Mauro Carvalho Chehab <mchehab@infradead.org> 3# Copyright (c) Mauro Carvalho Chehab <mchehab@infradead.org>
4# Released under GPLv2 4# Released under GPLv2
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index cb470fdee733..86a3c0e5cfbc 100755
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -174,7 +174,7 @@ dir_filelist() {
174 ${dep_list}header "$1" 174 ${dep_list}header "$1"
175 175
176 srcdir=$(echo "$1" | sed -e 's://*:/:g') 176 srcdir=$(echo "$1" | sed -e 's://*:/:g')
177 dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n") 177 dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" | sort)
178 178
179 # If $dirlist is only one line, then the directory is empty 179 # If $dirlist is only one line, then the directory is empty
180 if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then 180 if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
diff --git a/scripts/get_dvb_firmware b/scripts/get_dvb_firmware
index 1a0a04125f71..f3f230225aba 100755
--- a/scripts/get_dvb_firmware
+++ b/scripts/get_dvb_firmware
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2# DVB firmware extractor 2# DVB firmware extractor
3# 3#
4# (c) 2004 Andrew de Quincey 4# (c) 2004 Andrew de Quincey
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 633f2dd3de27..3bd5f4f30235 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# (c) 2007, Joe Perches <joe@perches.com> 2# (c) 2007, Joe Perches <joe@perches.com>
3# created from checkpatch.pl 3# created from checkpatch.pl
4# 4#
@@ -10,6 +10,7 @@
10# 10#
11# Licensed under the terms of the GNU GPL License version 2 11# Licensed under the terms of the GNU GPL License version 2
12 12
13use warnings;
13use strict; 14use strict;
14 15
15my $P = $0; 16my $P = $0;
diff --git a/scripts/headerdep.pl b/scripts/headerdep.pl
index 8dd019bc5a73..86ebb9ee7570 100755
--- a/scripts/headerdep.pl
+++ b/scripts/headerdep.pl
@@ -1,4 +1,4 @@
1#! /usr/bin/perl 1#! /usr/bin/env perl
2# 2#
3# Detect cycles in the header file dependency graph 3# Detect cycles in the header file dependency graph
4# Vegard Nossum <vegardno@ifi.uio.no> 4# Vegard Nossum <vegardno@ifi.uio.no>
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index 8b2da054cdc3..3091e4ee6ee1 100755
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# 2#
3# headers_check.pl execute a number of trivial consistency checks 3# headers_check.pl execute a number of trivial consistency checks
4# 4#
@@ -18,6 +18,7 @@
18# 18#
19# 3) Check for leaked CONFIG_ symbols 19# 3) Check for leaked CONFIG_ symbols
20 20
21use warnings;
21use strict; 22use strict;
22use File::Basename; 23use File::Basename;
23 24
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index b8c7b29affc5..a2e83ab17de3 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# 2#
3# Copyright 2005-2009 - Steven Rostedt 3# Copyright 2005-2009 - Steven Rostedt
4# Licensed under the terms of the GNU GPL License version 2 4# Licensed under the terms of the GNU GPL License version 2
@@ -42,6 +42,7 @@
42# mv config_strip .config 42# mv config_strip .config
43# make oldconfig 43# make oldconfig
44# 44#
45use warnings;
45use strict; 46use strict;
46use Getopt::Long; 47use Getopt::Long;
47 48
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index c1ffd31ff423..6e36b7889001 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1,5 +1,6 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2 2
3use warnings;
3use strict; 4use strict;
4 5
5## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ## 6## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ##
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
index c21d16328d3f..70dcfb6b3de1 100755
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2 2
3use File::Basename; 3use File::Basename;
4use Math::BigInt; 4use Math::BigInt;
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 6fdc97ef6023..fd8fdb91581d 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -76,7 +76,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
76 echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\" 76 echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
77 echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\" 77 echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
78 78
79 echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | grep ' version '`\" 79 echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | grep ' version ' | sed 's/[[:space:]]*$//'`\"
80) > .tmpcompile 80) > .tmpcompile
81 81
82# Only replace the real compile.h if the new one is different, 82# Only replace the real compile.h if the new one is different,
diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index 9f3c9d47a4a5..729c547fc9e1 100755
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# 2#
3# namespace.pl. Mon Aug 30 2004 3# namespace.pl. Mon Aug 30 2004
4# 4#
@@ -62,7 +62,7 @@
62# result. 62# result.
63# 63#
64 64
65require 5; # at least perl 5 65use warnings;
66use strict; 66use strict;
67use File::Find; 67use File::Find;
68 68
diff --git a/scripts/profile2linkerlist.pl b/scripts/profile2linkerlist.pl
index 6943fa7cc95b..f23d7be94394 100755
--- a/scripts/profile2linkerlist.pl
+++ b/scripts/profile2linkerlist.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2 2
3# 3#
4# Takes a (sorted) output of readprofile and turns it into a list suitable for 4# Takes a (sorted) output of readprofile and turns it into a list suitable for
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 1633c3e6c0b9..2033af758173 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -1,4 +1,4 @@
1#!/usr/bin/perl -w 1#!/usr/bin/env perl
2# (c) 2008, Steven Rostedt <srostedt@redhat.com> 2# (c) 2008, Steven Rostedt <srostedt@redhat.com>
3# Licensed under the terms of the GNU GPL License version 2 3# Licensed under the terms of the GNU GPL License version 2
4# 4#
@@ -106,6 +106,7 @@
106# 9) Move the result back to the original object. 106# 9) Move the result back to the original object.
107# 107#
108 108
109use warnings;
109use strict; 110use strict;
110 111
111my $P = $0; 112my $P = $0;
diff --git a/scripts/stackdelta b/scripts/stackdelta
index 48eabf2f48f8..20a79f19a111 100755
--- a/scripts/stackdelta
+++ b/scripts/stackdelta
@@ -1,4 +1,4 @@
1#!/usr/bin/perl 1#!/usr/bin/env perl
2 2
3# Read two files produced by the stackusage script, and show the 3# Read two files produced by the stackusage script, and show the
4# delta between them. 4# delta between them.