aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2019-12-11 14:29:55 +0000
committerDaniel Thompson <daniel.thompson@linaro.org>2020-08-12 16:56:31 +0100
commitc408c8b29ccf77f1d3b15d6b4e5518c2d5ceafeb (patch)
tree54f94a482c108ad88116a1fe7283e51342674fb1
parent86191014487427eda499584e1fcbee15fe6bcb14 (diff)
downloadlinux-c408c8b29ccf77f1d3b15d6b4e5518c2d5ceafeb.tar.gz
kbuild: deb-pkg: Pass KBUILD_IMAGE explicitly to package make
KBUILD_IMAGE can be used to encourage the deb-pkg and bindeb-pkg rules to package a non-standard kernel image. For example, for arm64 builds, we can use KBUILD_IMAGE=arch/arm64/boot/Image to ensure the resulting package includes an uncompressed version of the kernel. However using this trick results in a orig, diff and dsc triplet that does not rebuild the same package because MAKEFLAGS isn't set during the rebuild. We can fix this by explicitly writing out KBUILD_IMAGE to the intermediate files. Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
-rwxr-xr-xscripts/package/mkdebian6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 3a0151763304..126e19dbcedf 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -219,11 +219,13 @@ srctree ?= .
build:
\$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
- KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile
+ KBUILD_BUILD_VERSION=${revision} KBUILD_IMAGE=${KBUILD_IMAGE} \
+ -f \$(srctree)/Makefile
binary-arch:
\$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
- KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg
+ KBUILD_BUILD_VERSION=${revision} KBUILD_IMAGE=${KBUILD_IMAGE} \
+ -f \$(srctree)/Makefile intdeb-pkg
clean:
rm -rf debian/*tmp debian/files