From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Jan 2025 20:07:07 +0000 (-0800)
Subject: Merge tag 'kbuild-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fd8c09ad0d87783b9b6a27900d66293be45b7bad;p=users%2Fhch%2Fmisc.git

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

Pull Kbuild updates from Masahiro Yamada:

 - Support multiple hook locations for maint scripts of Debian package

 - Remove 'cpio' from the build tool requirement

 - Introduce gendwarfksyms tool, which computes CRCs for export symbols
   based on the DWARF information

 - Support CONFIG_MODVERSIONS for Rust

 - Resolve all conflicts in the genksyms parser

 - Fix several syntax errors in genksyms

* tag 'kbuild-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (64 commits)
  kbuild: fix Clang LTO with CONFIG_OBJTOOL=n
  kbuild: Strip runtime const RELA sections correctly
  kconfig: fix memory leak in sym_warn_unmet_dep()
  kconfig: fix file name in warnings when loading KCONFIG_DEFCONFIG_LIST
  genksyms: fix syntax error for attribute before init-declarator
  genksyms: fix syntax error for builtin (u)int*x*_t types
  genksyms: fix syntax error for attribute after 'union'
  genksyms: fix syntax error for attribute after 'struct'
  genksyms: fix syntax error for attribute after abstact_declarator
  genksyms: fix syntax error for attribute before nested_declarator
  genksyms: fix syntax error for attribute before abstract_declarator
  genksyms: decouple ATTRIBUTE_PHRASE from type-qualifier
  genksyms: record attributes consistently for init-declarator
  genksyms: restrict direct-declarator to take one parameter-type-list
  genksyms: restrict direct-abstract-declarator to take one parameter-type-list
  genksyms: remove Makefile hack
  genksyms: fix last 3 shift/reduce conflicts
  genksyms: fix 6 shift/reduce conflicts and 5 reduce/reduce conflicts
  genksyms: reduce type_qualifier directly to decl_specifier
  genksyms: rename cvar_qualifier to type_qualifier
  ...
---

fd8c09ad0d87783b9b6a27900d66293be45b7bad
diff --cc kernel/gen_kheaders.sh
index 7e1340da5aca,c9e5dc068e85..00529c81cc40
--- a/kernel/gen_kheaders.sh
+++ b/kernel/gen_kheaders.sh
@@@ -89,9 -89,8 +89,9 @@@ rm -f "${tmpdir}.contents.txt
  
  # Create archive and try to normalize metadata for reproducibility.
  tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
 +    --exclude=".__afs*" --exclude=".nfs*" \
      --owner=0 --group=0 --sort=name --numeric-owner --mode=u=rw,go=r,a+X \
-     -I $XZ -cf $tarfile -C $cpio_dir/ . > /dev/null
+     -I $XZ -cf $tarfile -C "${tmpdir}/" . > /dev/null
  
  echo $headers_md5 > kernel/kheaders.md5
  echo "$this_file_md5" >> kernel/kheaders.md5