Commit 2fd6c455 authored by Masahiro Yamada's avatar Masahiro Yamada

kbuild: deb-pkg: make debian source package working again

Since commit c5bf2efb ("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: c5bf2efb ("kbuild: deb-pkg: fix binary-arch and clean in debian/rules")
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent c753ccb2
...@@ -239,6 +239,7 @@ cat <<EOF > debian/rules ...@@ -239,6 +239,7 @@ cat <<EOF > debian/rules
#!$(command -v $MAKE) -f #!$(command -v $MAKE) -f
srctree ?= . srctree ?= .
KERNELRELEASE = ${KERNELRELEASE}
build-indep: build-indep:
build-arch: build-arch:
...@@ -250,7 +251,9 @@ build: build-arch ...@@ -250,7 +251,9 @@ build: build-arch
binary-indep: binary-indep:
binary-arch: build-arch binary-arch: build-arch
\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} intdeb-pkg \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
KERNELRELEASE=\$(KERNELRELEASE) intdeb-pkg
clean: clean:
rm -rf debian/files debian/linux-* rm -rf debian/files debian/linux-*
\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} clean \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} clean
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment