diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2023-03-12 21:07:26 +0100 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2023-03-15 07:15:07 +0100 |
| commit | 2fd6c4553c962ec7ea8a60c0a3632c7e984800f0 (patch) | |
| tree | faa3a1a58e4a3cad2128d28e1c91b431ad7197d6 /scripts/package | |
| parent | Makefile: Make kernelrelease target work with M= (diff) | |
| download | linux-2fd6c4553c962ec7ea8a60c0a3632c7e984800f0.tar.xz linux-2fd6c4553c962ec7ea8a60c0a3632c7e984800f0.zip | |
kbuild: deb-pkg: make debian source package working again
Since commit c5bf2efb058d ("kbuild: deb-pkg: fix binary-arch and clean
in debian/rules"), the source package generated by 'make deb-pkg' fails
to build.
I terribly missed the fact that the intdeb-pkg target may regenerate
include/config/kernel.release due to the following in the top Makefile:
%pkg: include/config/kernel.release FORCE
Restore KERNELRELEASE= option to avoid the kernel.release disagreement
between build-arch and binary-arch.
Fixes: c5bf2efb058d ("kbuild: deb-pkg: fix binary-arch and clean in debian/rules")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts/package')
| -rwxr-xr-x | scripts/package/mkdebian | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index f74380036bb5..c6fbfb9f74ba 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -239,6 +239,7 @@ cat <<EOF > debian/rules #!$(command -v $MAKE) -f srctree ?= . +KERNELRELEASE = ${KERNELRELEASE} build-indep: build-arch: @@ -250,7 +251,9 @@ build: build-arch binary-indep: binary-arch: build-arch - \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} intdeb-pkg + \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \ + KERNELRELEASE=\$(KERNELRELEASE) intdeb-pkg + clean: rm -rf debian/files debian/linux-* \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} clean |