Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- fix missed rebuild of TRIM_UNUSED_KSYMS
- fix rpm-pkg for GNU tar >= 1.29
- include scripts/dtc/include-prefixes/* to kernel header deb-pkg
- add -no-integrated-as option ealier to fix building with Clang
- fix netfilter Makefile for parallel building
* tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
netfilter: nf_nat_snmp_basic: add correct dependency to Makefile
kbuild: rpm-pkg: Support GNU tar >= 1.29
builddeb: Fix header package regarding dtc source links
kbuild: set no-integrated-as before incl. arch Makefile
kbuild: make scripts/adjust_autoksyms.sh robust against timestamp races
+12
-5
+2
-2
Makefile
+2
-2
Makefile
···
487
487
endif
488
488
KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
489
489
KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
490
+
KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
491
+
KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
490
492
endif
491
493
492
494
RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
···
745
743
# See modpost pattern 2
746
744
KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
747
745
KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
748
-
KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
749
-
KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
750
746
else
751
747
752
748
# These warnings generated too much noise in a regular build.
+1
-1
net/ipv4/netfilter/Makefile
+1
-1
net/ipv4/netfilter/Makefile
···
29
29
obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
30
30
31
31
nf_nat_snmp_basic-y := nf_nat_snmp_basic-asn1.o nf_nat_snmp_basic_main.o
32
-
nf_nat_snmp_basic-y : nf_nat_snmp_basic-asn1.h nf_nat_snmp_basic-asn1.c
32
+
$(obj)/nf_nat_snmp_basic_main.o: $(obj)/nf_nat_snmp_basic-asn1.h
33
33
obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
34
34
clean-files := nf_nat_snmp_basic-asn1.c nf_nat_snmp_basic-asn1.h
35
35
+7
scripts/adjust_autoksyms.sh
+7
scripts/adjust_autoksyms.sh
···
84
84
depfile="include/config/ksym/${sympath}.h"
85
85
mkdir -p "$(dirname "$depfile")"
86
86
touch "$depfile"
87
+
# Filesystems with coarse time precision may create timestamps
88
+
# equal to the one from a file that was very recently built and that
89
+
# needs to be rebuild. Let's guard against that by making sure our
90
+
# dep files are always newer than the first file we created here.
91
+
while [ ! "$depfile" -nt "$new_ksyms_file" ]; do
92
+
touch "$depfile"
93
+
done
87
94
echo $((count += 1))
88
95
done | tail -1 )
89
96
changed=${changed:-0}
+1
-1
scripts/package/builddeb
+1
-1
scripts/package/builddeb
···
313
313
314
314
# Build kernel header package
315
315
(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
316
-
(cd $srctree; find arch/*/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
316
+
(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
317
317
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
318
318
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
319
319
if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
+1
-1
scripts/package/mkspec
+1
-1
scripts/package/mkspec
···
98
98
$S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build
99
99
$S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/source
100
100
$S$M mkdir -p %{buildroot}/usr/src/kernels/$KERNELRELEASE
101
-
$S$M tar cf - . $EXCLUDES | tar xf - -C %{buildroot}/usr/src/kernels/$KERNELRELEASE
101
+
$S$M tar cf - $EXCLUDES . | tar xf - -C %{buildroot}/usr/src/kernels/$KERNELRELEASE
102
102
$S$M cd %{buildroot}/lib/modules/$KERNELRELEASE
103
103
$S$M ln -sf /usr/src/kernels/$KERNELRELEASE build
104
104
$S$M ln -sf /usr/src/kernels/$KERNELRELEASE source