Skip to content

Commit

Permalink
kbuild: deb-pkg: make debian source package working again
Browse files Browse the repository at this point in the history
Since commit c5bf2ef ("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: c5bf2ef ("kbuild: deb-pkg: fix binary-arch and clean in debian/rules")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
  • Loading branch information
Masahiro Yamada committed Mar 15, 2023
1 parent c753ccb commit 2fd6c45
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion scripts/package/mkdebian
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ cat <<EOF > debian/rules
#!$(command -v $MAKE) -f
srctree ?= .
KERNELRELEASE = ${KERNELRELEASE}
build-indep:
build-arch:
Expand All @@ -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
Expand Down

0 comments on commit 2fd6c45

Please sign in to comment.