Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

+4 -1
+4 -1
scripts/package/mkdebian
··· 239 239 #!$(command -v $MAKE) -f 240 240 241 241 srctree ?= . 242 + KERNELRELEASE = ${KERNELRELEASE} 242 243 243 244 build-indep: 244 245 build-arch: ··· 251 250 252 251 binary-indep: 253 252 binary-arch: build-arch 254 - \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} intdeb-pkg 253 + \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \ 254 + KERNELRELEASE=\$(KERNELRELEASE) intdeb-pkg 255 + 255 256 clean: 256 257 rm -rf debian/files debian/linux-* 257 258 \$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} clean