Merge tag 'kbuild-fixes-v6.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

- Make scripts/ld-version.sh robust against the latest LLD

- Fix warnings in rpm-pkg with device tree support

- Fix warnings in fortify tests with KASAN

* tag 'kbuild-fixes-v6.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
fortify: fix warnings in fortify tests with KASAN
kbuild: rpm-pkg: avoid the warnings with dtb's listed twice
kbuild: Make ld-version.sh more robust against version string changes

Changed files
+9 -4
lib
scripts
+4
lib/Makefile
··· 426 426 ifeq ($(CONFIG_FORTIFY_SOURCE),y) 427 427 $(obj)/string.o: $(obj)/$(TEST_FORTIFY_LOG) 428 428 endif 429 + 430 + # Some architectures define __NO_FORTIFY if __SANITIZE_ADDRESS__ is undefined. 431 + # Pass CFLAGS_KASAN to avoid warnings. 432 + $(foreach x, $(patsubst %.log,%.o,$(TEST_FORTIFY_LOGS)), $(eval KASAN_SANITIZE_$(x) := y))
+5 -3
scripts/ld-version.sh
··· 57 57 fi 58 58 fi 59 59 60 - # Some distributions append a package release number, as in 2.34-4.fc32 61 - # Trim the hyphen and any characters that follow. 62 - version=${version%-*} 60 + # There may be something after the version, such as a distribution's package 61 + # release number (like Fedora's "2.34-4.fc32") or punctuation (like LLD briefly 62 + # added before the "compatible with GNU linkers" string), so remove everything 63 + # after just numbers and periods. 64 + version=${version%%[!0-9.]*} 63 65 64 66 cversion=$(get_canonical_version $version) 65 67 min_cversion=$(get_canonical_version $min_version)
-1
scripts/package/kernel.spec
··· 83 83 done 84 84 85 85 if [ -d "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" ];then 86 - echo "/lib/modules/%{KERNELRELEASE}/dtb" 87 86 find "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" -printf "%%%ghost /boot/dtb-%{KERNELRELEASE}/%%P\n" 88 87 fi 89 88