kbuild: builddeb - avoid recompiles for non-cross-compiles
PATCH 1/1 kbuild: builddeb - avoid recompiles for non-cross-compiles
Commit e2c318225ac1 ("kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile") changed how install-extmod-build gets called, making it always rebuild the host programs below scripts/ if HOSTCC wasn't specified with its full triplet on the make command line. That is, apparently, needed to fix up commit f1d87664b82a ("kbuild: cross-compile linux-headers package when possible") for cross-compiles. However, in the much more common case of non-cross-compile builds this will lead to unnecessary rebuilding of host tools including gcc plugins. This, in turn, will lead to a full kernel rebuild on the next 'make bindeb-pkg' which is unfortunate.
Avoid that by only triggering the rebuild of host tools for actual cross-compile builds.
--- scripts/package/builddeb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
scripts/package/builddeb +7 -1
@@ -139,7 +139,13 @@ install_kernel_headers () { pdir=debian/$1 version=${1#linux-headers-} - CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + # Override $CC only for cross-compiles, to not unnecessarily rebuild + # scripts/ including plugins, which may lead to a full kernel rebuild. + if [ -n "${CROSS_COMPILE}" ]; then + CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + else + "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + fi mkdir -p $pdir/lib/modules/$version/ ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/build
Signature · 1 line
2.47.3
Quoted 43 lines · Mathias Krause
Commit
e2c318225ac1("kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile") changed how install-extmod-build gets called, making it always rebuild the host programs belowscripts/if HOSTCC wasn't specified with its full triplet on the make command line. That is, apparently, needed to fix up commitf1d87664b82a("kbuild: cross-compile linux-headers package when possible") for cross-compiles. However, in the much more common case of non-cross-compile builds this will lead to unnecessary rebuilding of host tools including gcc plugins. This, in turn, will lead to a full kernel rebuild on the next 'make bindeb-pkg' which is unfortunate.Avoid that by only triggering the rebuild of host tools for actual cross-compile builds.
Signed-off-by Mathias Krause <[email protected]>Fixes e2c318225ac1 ("kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile")Cc Masahiro Yamada <[email protected]>--- scripts/package/builddeb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)scripts/package/builddeb +7
-1@@ -139,7 +139,13 @@ install_kernel_headers () { pdir=debian/$1 version=${1#linux-headers-} - CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + # Override $CC only for cross-compiles, to not unnecessarily rebuild + # scripts/ including plugins, which may lead to a full kernel rebuild. + if [ -n "${CROSS_COMPILE}" ]; then + CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + else + "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + fi mkdir -p $pdir/lib/modules/$version/ ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/buildSignature · 1 line
2.47.3
Thanks!
Signature · 1 line
Nicolas
Quoted 11 lines · Mathias Krause
Commit
e2c318225ac1("kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile") changed how install-extmod-build gets called, making it always rebuild the host programs belowscripts/if HOSTCC wasn't specified with its full triplet on the make command line. That is, apparently, needed to fix up commitf1d87664b82a("kbuild: cross-compile linux-headers package when possible") for cross-compiles. However, in the much more common case of non-cross-compile builds this will lead to unnecessary rebuilding of host tools including gcc plugins. This, in turn, will lead to a full kernel rebuild on the next 'make bindeb-pkg' which is unfortunate.
Quoted 6 lines
Avoid that by only triggering the rebuild of host tools for actual cross-compile builds.
Signed-off-by Mathias Krause <[email protected]>Fixes e2c318225ac1 ("kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile")Cc Masahiro Yamada <[email protected]>
Yeah, this seems like a reasonable workaround. I think this also helps avoid some weirdness I have noticed when building Debian packages with LLVM (as CC becomes gcc, always triggering the same logic since HOSTCC will be clang).
Quoted 26 lines
--- scripts/package/builddeb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)scripts/package/builddeb +7
-1@@ -139,7 +139,13 @@ install_kernel_headers () { pdir=debian/$1 version=${1#linux-headers-} - CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + # Override $CC only for cross-compiles, to not unnecessarily rebuild + # scripts/ including plugins, which may lead to a full kernel rebuild. + if [ -n "${CROSS_COMPILE}" ]; then + CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + else + "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" + fi mkdir -p $pdir/lib/modules/$version/ ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/buildSignature · 1 line
2.47.3
Quoted 19 lines · Nathan Chancellor
Quoted 11 lines · Mathias Krause
Commit
e2c318225ac1("kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile") changed how install-extmod-build gets called, making it always rebuild the host programs belowscripts/if HOSTCC wasn't specified with its full triplet on the make command line. That is, apparently, needed to fix up commitf1d87664b82a("kbuild: cross-compile linux-headers package when possible") for cross-compiles. However, in the much more common case of non-cross-compile builds this will lead to unnecessary rebuilding of host tools including gcc plugins. This, in turn, will lead to a full kernel rebuild on the next 'make bindeb-pkg' which is unfortunate.Quoted 6 lines
Avoid that by only triggering the rebuild of host tools for actual cross-compile builds.
Signed-off-by Mathias Krause <[email protected]>Fixes e2c318225ac1 ("kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile")Cc Masahiro Yamada <[email protected]>
Quoted 6 lines
Yeah, this seems like a reasonable workaround. I think this also helps avoid some weirdness I have noticed when building Debian packages with LLVM (as CC becomes gcc, always triggering the same logic since HOSTCC will be clang).
Reviewed-by Nathan Chancellor <[email protected]>
Can you carry this via the kbuild tree, which seems to be the most fitting one, according to MAINTAINERS?
Thanks,
Mathias
Nicolas Schier
maintainerQuoted 11 lines · Mathias Krause
Commit
e2c318225ac1("kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile") changed how install-extmod-build gets called, making it always rebuild the host programs belowscripts/if HOSTCC wasn't specified with its full triplet on the make command line. That is, apparently, needed to fix up commitf1d87664b82a("kbuild: cross-compile linux-headers package when possible") for cross-compiles. However, in the much more common case of non-cross-compile builds this will lead to unnecessary rebuilding of host tools including gcc plugins. This, in turn, will lead to a full kernel rebuild on the next 'make bindeb-pkg' which is unfortunate.
Quoted 1 line
[...]
Applied to kbuild/linux.git (kbuild-fixes-unstable), thanks!
[1/1] kbuild: builddeb - avoid recompiles for non-cross-compiles
https://git.kernel.org/kbuild/c/2452dcf4
Please look out for regression or issue reports or other follow up comments, as they may result in the patch/series getting dropped, reverted or modified (e.g. trailers). Patches applied to the kbuild-fixes-unstable branch are accepted pending wider testing in linux-next and any post-commit review; they will generally be moved to the kbuild-fixes branch in a week if no issues are found.
Best regards,
Signature · 1 line
Nicolas