UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Since commit c5bf2efb05 ("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: c5bf2efb05 ("kbuild: deb-pkg: fix binary-arch and clean in debian/rules")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2023-03-13 05:07:26 +09:00
parent c753ccb262
commit 2fd6c4553c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/package/mkdebian
View File

@ -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
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