Skip to content

Commit a0c04bd

Browse files
committed
Merge tag 'kbuild-fixes-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada: - Fix RPM package build error caused by an incorrect locale setup - Mark modules.weakdep as ghost in RPM package - Fix the odd combination of -S and -c in stack protector scripts, which is an error with the latest Clang * tag 'kbuild-fixes-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: Fix '-S -c' in x86 stack protector scripts kbuild: rpm-pkg: ghost modules.weakdep file kbuild: rpm-pkg: Fix C locale setup
2 parents 017fa3e + 3415b10 commit a0c04bd

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

scripts/gcc-x86_32-has-stack-protector.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# -mstack-protector-guard-reg, added by
66
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81708
77

8-
echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -m32 -O0 -fstack-protector -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard - -o - 2> /dev/null | grep -q "%fs"
8+
echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -m32 -O0 -fstack-protector -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard - -o - 2> /dev/null | grep -q "%fs"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
# SPDX-License-Identifier: GPL-2.0
33

4-
echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -m64 -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
4+
echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -m64 -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"

scripts/package/kernel.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA
7474
echo "/lib/modules/%{KERNELRELEASE}"
7575

7676
for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \
77-
devname softdep symbols symbols.bin; do
77+
devname softdep symbols symbols.bin weakdep; do
7878
echo "%ghost /lib/modules/%{KERNELRELEASE}/modules.${x}"
7979
done
8080

scripts/package/mkspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ fi
5050
cat << EOF
5151
5252
%changelog
53-
* $(LC_ALL=C; date +'%a %b %d %Y') ${name} <${email}>
53+
* $(LC_ALL=C date +'%a %b %d %Y') ${name} <${email}>
5454
- Custom built Linux kernel.
5555
EOF

0 commit comments

Comments
 (0)