| Message ID | CAK7LNAShL3dfQ0Ter2avCvGPjrd0YTJau-S4+8rJyWXmu0tG0Q@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] Kbuild updates for v5.17-rc1 | expand |
On Tue, Jan 18, 2022 at 9:43 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > You will see a trivial conflict in scripts/link-vmlinux.sh > (commit 72b3942a173c in the mainline > vs 7d153696e5db from this PR) > The fix is available in linux-next. The resolution in linux-next seems to be wrong. It missed a new case of if [ -n "${CONFIG_SLS}" ]; then in scripts/link-vmlinux.sh, which no longer works after commit 7d153696e5db ("kbuild: do not include include/config/auto.conf from shell scripts"). That needed to be converted to if is_enabled CONFIG_SLS; then too. I think that was the only case. Knock wood. Linus
The pull request you sent on Wed, 19 Jan 2022 04:42:17 +0900:
> git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git tags/kbuild-v5.17
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/fd6f57bfda7c36f2d465cee39d5d8c623db5d7aa
Thank you!
Hi Linus, Please pull Kbuild updates. Thanks. You will see a trivial conflict in scripts/link-vmlinux.sh (commit 72b3942a173c in the mainline vs 7d153696e5db from this PR) The fix is available in linux-next. The following changes since commit d58071a8a76d779eedab38033ae4c821c30295a5: Linux 5.16-rc3 (2021-11-28 14:09:19 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git tags/kbuild-v5.17 for you to fetch changes up to c4d7f40b250c1a4d74ed259e84807f58032507b6: kbuild: add cmd_file_size (2022-01-14 02:57:43 +0900) ---------------------------------------------------------------- Kbuild updates for v5.17 - Add new kconfig target 'make mod2noconfig', which will be useful to speed up the build and test iteration. - Raise the minimum supported version of LLVM to 11.0.0 - Refactor certs/Makefile - Change the format of include/config/auto.conf to stop double-quoting string type CONFIG options. - Fix ARCH=sh builds in dash - Separate compression macros for general purposes (cmd_bzip2 etc.) and the ones for decompressors (cmd_bzip2_with_size etc.) - Misc Makefile cleanups ---------------------------------------------------------------- Josh Triplett (1): kconfig: Add `make mod2noconfig` to disable module options Masahiro Yamada (25): certs: move the 'depends on' to the choice of module signing keys nds32: remove unused BUILTIN_DTB from arch/nds32/Makefile certs: remove meaningless $(error ...) in certs/Makefile certs: check-in the default x509 config file certs: remove noisy messages while generating the signing key certs: use 'cmd' to hide openssl output in silent builds more simply certs: use if_changed to re-generate the key when the key type is changed kbuild: move headers_check.pl to usr/include/ kbuild: remove headers_check stub certs: use $< and $@ to simplify the key generation rule certs: unify duplicated cmd_extract_certs and improve the log certs: remove unneeded -I$(srctree) option for system_certificates.o certs: refactor file cleaning certs: remove misleading comments about GCC PR kbuild: stop using config_filename in scripts/Makefile.modsign certs: simplify $(srctree)/ handling and remove config_filename macro kbuild: do not include include/config/auto.conf from shell scripts kbuild: do not quote string values in include/config/auto.conf certs: move scripts/extract-cert to certs/ microblaze: use built-in function to get CPU_{MAJOR,MINOR,REV} sh: rename suffix-y to suffix_y kbuild: drop $(size_append) from cmd_zstd kbuild: rename cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22} arch: decompressor: remove useless vmlinux.bin.all-y kbuild: add cmd_file_size Miguel Ojeda (1): doc: kbuild: fix default in `imply` table Nathan Chancellor (6): Documentation: Raise the minimum supported version of LLVM to 11.0.0 mm, slab: Remove compiler check in __kmalloc_index arch/Kconfig: Remove CLANG_VERSION check in HAS_LTO_CLANG Revert "ARM: 9070/1: Make UNWINDER_ARM depend on ld.bfd or ld.lld 11.0.0+" gcov: Remove compiler version check init/Kconfig: Drop linker version check for LD_ORPHAN_WARN Łukasz Stelmach (1): streamline_config.pl: show the full Kconfig name Documentation/kbuild/kconfig-language.rst | 2 +- Documentation/process/changes.rst | 2 +- MAINTAINERS | 1 - Makefile | 15 +-- arch/Kconfig | 3 +- arch/arc/Makefile | 4 +- arch/arc/boot/dts/Makefile | 4 +- arch/arm/Kconfig.debug | 2 - arch/arm/boot/compressed/Makefile | 8 +- arch/h8300/boot/compressed/Makefile | 4 +- arch/h8300/boot/dts/Makefile | 6 +- arch/microblaze/Makefile | 8 +- arch/mips/boot/compressed/Makefile | 12 +-- arch/nds32/Makefile | 6 -- arch/nds32/boot/dts/Makefile | 7 +- arch/nios2/boot/dts/Makefile | 2 +- arch/openrisc/boot/dts/Makefile | 7 +- arch/parisc/boot/compressed/Makefile | 24 +++-- arch/powerpc/boot/Makefile | 2 +- arch/riscv/boot/dts/canaan/Makefile | 4 +- arch/s390/boot/compressed/Makefile | 28 +++--- arch/sh/boot/Makefile | 16 ++-- arch/sh/boot/compressed/Makefile | 22 ++--- arch/sh/boot/dts/Makefile | 4 +- arch/x86/boot/compressed/Makefile | 12 +-- arch/xtensa/Makefile | 2 +- arch/xtensa/boot/dts/Makefile | 5 +- certs/.gitignore | 1 + certs/Kconfig | 4 +- certs/Makefile | 125 +++++++------------------ certs/default_x509.genkey | 17 ++++ {scripts => certs}/extract-cert.c | 2 +- drivers/acpi/Makefile | 2 +- drivers/base/firmware_loader/builtin/Makefile | 4 +- include/linux/slab.h | 3 +- include/uapi/linux/soundcard.h | 2 +- init/Kconfig | 1 - init/Makefile | 2 +- kernel/gcov/Kconfig | 1 - net/wireless/Makefile | 4 +- scripts/.gitignore | 1 - scripts/Kbuild.include | 47 ---------- scripts/Makefile | 11 +-- scripts/Makefile.lib | 35 +++++-- scripts/Makefile.modinst | 4 +- scripts/gen_autoksyms.sh | 11 +-- scripts/kconfig/Makefile | 3 +- scripts/kconfig/conf.c | 17 ++-- scripts/kconfig/confdata.c | 24 ++--- scripts/kconfig/streamline_config.pl | 2 +- scripts/link-vmlinux.sh | 47 +++++----- scripts/min-tool-version.sh | 2 +- scripts/remove-stale-files | 2 + scripts/setlocalversion | 9 +- usr/Makefile | 7 +- usr/include/Makefile | 6 +- {scripts => usr/include}/headers_check.pl | 0 57 files changed, 242 insertions(+), 366 deletions(-) create mode 100644 certs/default_x509.genkey rename {scripts => certs}/extract-cert.c (98%) rename {scripts => usr/include}/headers_check.pl (100%)