Skip to content

Commit

Permalink
Merge tag 'kbuild-misc-v4.13' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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
  • Loading branch information
torvalds committed Jul 7, 2017
2 parents 58f051f + 9e6e0d5 commit 16ffc4c
Show file tree
Hide file tree
Showing 25 changed files with 37 additions and 26 deletions.
2 changes: 1 addition & 1 deletion scripts/bootgraph.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

# Copyright 2008, Intel Corporation
#
Expand Down
2 changes: 1 addition & 1 deletion scripts/checkincludes.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
#
# checkincludes: find/remove files included more than once
#
Expand Down
3 changes: 2 additions & 1 deletion scripts/checkpatch.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
# (c) 2001, Dave Jones. (the file handling bit)
# (c) 2005, Joel Schopp <[email protected]> (the ugly bit)
# (c) 2007,2008, Andy Whitcroft <[email protected]> (new conditions, test suite)
# (c) 2008-2010 Andy Whitcroft <[email protected]>
# Licensed under the terms of the GNU GPL License version 2

use strict;
use warnings;
use POSIX;
use File::Basename;
use Cwd 'abs_path';
Expand Down
2 changes: 1 addition & 1 deletion scripts/checkstack.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

# Check the stack usage of functions
#
Expand Down
2 changes: 1 addition & 1 deletion scripts/checkversion.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl
#
# checkversion find uses of LINUX_VERSION_CODE or KERNEL_VERSION
# without including <linux/version.h>, or cases of
Expand Down
3 changes: 2 additions & 1 deletion scripts/cleanfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
#
# Clean a text file -- or directory of text files -- of stealth whitespace.
# WARNING: this can be a highly destructive operation. Use with caution.
#

use warnings;
use bytes;
use File::Basename;

Expand Down
3 changes: 2 additions & 1 deletion scripts/cleanpatch
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
#
# Clean a patch file -- or directory of patch files -- of stealth whitespace.
# WARNING: this can be a highly destructive operation. Use with caution.
#

use warnings;
use bytes;
use File::Basename;

Expand Down
2 changes: 1 addition & 1 deletion scripts/dtc/dt_to_config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

# Copyright 2016 by Frank Rowand
# Copyright 2016 by Gaurav Minocha
Expand Down
3 changes: 2 additions & 1 deletion scripts/export_report.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
#
# (C) Copyright IBM Corporation 2006.
# Released under GPL v2.
Expand All @@ -7,6 +7,7 @@
# Usage: export_report.pl -k Module.symvers [-o report_file ] -f *.mod.c
#

use warnings;
use Getopt::Std;
use strict;

Expand Down
3 changes: 2 additions & 1 deletion scripts/extract-module-sig.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
#
# extract-mod-sig <part> <module-file>
#
Expand All @@ -12,6 +12,7 @@
# -k: Just the key ID
# -s: Just the crypto signature or PKCS#7 message
#
use warnings;
use strict;

die "Format: $0 -[0adnks] module-file >out\n"
Expand Down
3 changes: 2 additions & 1 deletion scripts/extract-sys-certs.pl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
#
use warnings;
use strict;
use Math::BigInt;
use Fcntl "SEEK_SET";
Expand Down
2 changes: 1 addition & 1 deletion scripts/extract_xc3028.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

# Copyright (c) Mauro Carvalho Chehab <[email protected]>
# Released under GPLv2
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen_initramfs_list.sh
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ dir_filelist() {
${dep_list}header "$1"

srcdir=$(echo "$1" | sed -e 's://*:/:g')
dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n")
dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" | sort)

# If $dirlist is only one line, then the directory is empty
if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/get_dvb_firmware
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
# DVB firmware extractor
#
# (c) 2004 Andrew de Quincey
Expand Down
3 changes: 2 additions & 1 deletion scripts/get_maintainer.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
# (c) 2007, Joe Perches <[email protected]>
# created from checkpatch.pl
#
Expand All @@ -10,6 +10,7 @@
#
# Licensed under the terms of the GNU GPL License version 2

use warnings;
use strict;

my $P = $0;
Expand Down
2 changes: 1 addition & 1 deletion scripts/headerdep.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/perl
#! /usr/bin/env perl
#
# Detect cycles in the header file dependency graph
# Vegard Nossum <[email protected]>
Expand Down
3 changes: 2 additions & 1 deletion scripts/headers_check.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
#
# headers_check.pl execute a number of trivial consistency checks
#
Expand All @@ -18,6 +18,7 @@
#
# 3) Check for leaked CONFIG_ symbols

use warnings;
use strict;
use File::Basename;

Expand Down
3 changes: 2 additions & 1 deletion scripts/kconfig/streamline_config.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
#
# Copyright 2005-2009 - Steven Rostedt
# Licensed under the terms of the GNU GPL License version 2
Expand Down Expand Up @@ -42,6 +42,7 @@
# mv config_strip .config
# make oldconfig
#
use warnings;
use strict;
use Getopt::Long;

Expand Down
3 changes: 2 additions & 1 deletion scripts/kernel-doc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl

use warnings;
use strict;

## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ##
Expand Down
2 changes: 1 addition & 1 deletion scripts/markup_oops.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

use File::Basename;
use Math::BigInt;
Expand Down
2 changes: 1 addition & 1 deletion scripts/mkcompile_h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"

echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | grep ' version '`\"
echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | grep ' version ' | sed 's/[[:space:]]*$//'`\"
) > .tmpcompile

# Only replace the real compile.h if the new one is different,
Expand Down
4 changes: 2 additions & 2 deletions scripts/namespace.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
#
# namespace.pl. Mon Aug 30 2004
#
Expand Down Expand Up @@ -62,7 +62,7 @@
# result.
#

require 5; # at least perl 5
use warnings;
use strict;
use File::Find;

Expand Down
2 changes: 1 addition & 1 deletion scripts/profile2linkerlist.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

#
# Takes a (sorted) output of readprofile and turns it into a list suitable for
Expand Down
3 changes: 2 additions & 1 deletion scripts/recordmcount.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
# (c) 2008, Steven Rostedt <[email protected]>
# Licensed under the terms of the GNU GPL License version 2
#
Expand Down Expand Up @@ -106,6 +106,7 @@
# 9) Move the result back to the original object.
#

use warnings;
use strict;

my $P = $0;
Expand Down
2 changes: 1 addition & 1 deletion scripts/stackdelta
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

# Read two files produced by the stackusage script, and show the
# delta between them.
Expand Down

0 comments on commit 16ffc4c

Please sign in to comment.