mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +00:00
kbuild: replace LANG=C with LC_ALL=C
LANG gives a weak default to each LC_* in case it is not explicitly defined. LC_ALL, if set, overrides all other LC_* variables. LANG < LC_CTYPE, LC_COLLATE, LC_MONETARY, LC_NUMERIC, ... < LC_ALL This is why documentation such as [1] suggests to set LC_ALL in build scripts to get the deterministic result. LANG=C is not strong enough to override LC_* that may be set by end users. [1]: https://reproducible-builds.org/docs/locales/ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) Reviewed-by: Matthias Maennich <maennich@google.com> Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net> (mptcp) Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
885480b084
commit
77a88274dc
@ -191,7 +191,7 @@ if [ -z "$kernel" ]; then
|
|||||||
kernel=vmlinux
|
kernel=vmlinux
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LANG=C elfformat="`${CROSS}objdump -p "$kernel" | grep 'file format' | awk '{print $4}'`"
|
LC_ALL=C elfformat="`${CROSS}objdump -p "$kernel" | grep 'file format' | awk '{print $4}'`"
|
||||||
case "$elfformat" in
|
case "$elfformat" in
|
||||||
elf64-powerpcle) format=elf64lppc ;;
|
elf64-powerpcle) format=elf64lppc ;;
|
||||||
elf64-powerpc) format=elf32ppc ;;
|
elf64-powerpc) format=elf32ppc ;;
|
||||||
|
@ -44,7 +44,7 @@ generate_deps() {
|
|||||||
for source_file in $mod_source_files; do
|
for source_file in $mod_source_files; do
|
||||||
sed '/MODULE_IMPORT_NS/Q' $source_file > ${source_file}.tmp
|
sed '/MODULE_IMPORT_NS/Q' $source_file > ${source_file}.tmp
|
||||||
offset=$(wc -l ${source_file}.tmp | awk '{print $1;}')
|
offset=$(wc -l ${source_file}.tmp | awk '{print $1;}')
|
||||||
cat $source_file | grep MODULE_IMPORT_NS | LANG=C sort -u >> ${source_file}.tmp
|
cat $source_file | grep MODULE_IMPORT_NS | LC_ALL=C sort -u >> ${source_file}.tmp
|
||||||
tail -n +$((offset +1)) ${source_file} | grep -v MODULE_IMPORT_NS >> ${source_file}.tmp
|
tail -n +$((offset +1)) ${source_file} | grep -v MODULE_IMPORT_NS >> ${source_file}.tmp
|
||||||
if ! diff -q ${source_file} ${source_file}.tmp; then
|
if ! diff -q ${source_file} ${source_file}.tmp; then
|
||||||
mv ${source_file}.tmp ${source_file}
|
mv ${source_file}.tmp ${source_file}
|
||||||
|
@ -497,7 +497,7 @@ sub update_funcs
|
|||||||
#
|
#
|
||||||
# Step 2: find the sections and mcount call sites
|
# Step 2: find the sections and mcount call sites
|
||||||
#
|
#
|
||||||
open(IN, "LANG=C $objdump -hdr $inputfile|") || die "error running $objdump";
|
open(IN, "LC_ALL=C $objdump -hdr $inputfile|") || die "error running $objdump";
|
||||||
|
|
||||||
my $text;
|
my $text;
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ scm_version()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for svn and a svn repo.
|
# Check for svn and a svn repo.
|
||||||
if rev=$(LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'); then
|
if rev=$(LC_ALL=C svn info 2>/dev/null | grep '^Last Changed Rev'); then
|
||||||
rev=$(echo $rev | awk '{print $NF}')
|
rev=$(echo $rev | awk '{print $NF}')
|
||||||
printf -- '-svn%s' "$rev"
|
printf -- '-svn%s' "$rev"
|
||||||
|
|
||||||
|
@ -326,5 +326,5 @@ esac
|
|||||||
|
|
||||||
# Remove structure forward declarations.
|
# Remove structure forward declarations.
|
||||||
if [ -n "$remove_structs" ]; then
|
if [ -n "$remove_structs" ]; then
|
||||||
LANG=C sed -i -e '/^\([a-zA-Z_][a-zA-Z0-9_]*\)\t.*\t\/\^struct \1;.*\$\/;"\tx$/d' $1
|
LC_ALL=C sed -i -e '/^\([a-zA-Z_][a-zA-Z0-9_]*\)\t.*\t\/\^struct \1;.*\$\/;"\tx$/d' $1
|
||||||
fi
|
fi
|
||||||
|
@ -274,7 +274,7 @@ check_mptcp_disabled()
|
|||||||
ip netns exec ${disabled_ns} sysctl -q net.mptcp.enabled=0
|
ip netns exec ${disabled_ns} sysctl -q net.mptcp.enabled=0
|
||||||
|
|
||||||
local err=0
|
local err=0
|
||||||
LANG=C ip netns exec ${disabled_ns} ./mptcp_connect -p 10000 -s MPTCP 127.0.0.1 < "$cin" 2>&1 | \
|
LC_ALL=C ip netns exec ${disabled_ns} ./mptcp_connect -p 10000 -s MPTCP 127.0.0.1 < "$cin" 2>&1 | \
|
||||||
grep -q "^socket: Protocol not available$" && err=1
|
grep -q "^socket: Protocol not available$" && err=1
|
||||||
ip netns delete ${disabled_ns}
|
ip netns delete ${disabled_ns}
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ dir_filelist() {
|
|||||||
header "$1"
|
header "$1"
|
||||||
|
|
||||||
srcdir=$(echo "$1" | sed -e 's://*:/:g')
|
srcdir=$(echo "$1" | sed -e 's://*:/:g')
|
||||||
dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" | LANG=C sort)
|
dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" | LC_ALL=C sort)
|
||||||
|
|
||||||
# If $dirlist is only one line, then the directory is empty
|
# If $dirlist is only one line, then the directory is empty
|
||||||
if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
|
if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user