[PATCH v2] arm64: make rpm failed due to incorrect path to Image.gz
From: Will Deacon <hidden>
Date: 2016-09-30 09:14:15
On Fri, Sep 30, 2016 at 12:03:26AM -0700, Vadim Lomovtsev wrote:
[Adding Will Deacon] Sorry, should do this at the very beginning. ( On Thu, Sep 29, 2016 at 07:46:07AM -0700, Vadim Lomovtsev wrote:quoted
The "make rpm" and "make rpm-pkg" commands for arm64 platform are broken due to rpmbuild couldn't find Image.gz file at default location (which is kernel src root): cp: cannot stat 'Image.gz': No such file or directory error: Bad exit status from /var/tmp/rpm-tmp.ocFBmP (%install) While the correct path to arm64 kernel image file is "arch/arm64/boot/Image.gz". The exact file name (Image.gz) is stored at KBUILD_IMAGE variable and read by rpmbuild with "make image_name" command at install phase after kernel build is complete. Accordingly to Michal's Marek comment the KBUILD_IMAGE variable has to be set to point to actual file. Since the KBUILD_IMAGE variable is used in general cases of build we need to prevent other build types breakage by changing it. The solution is to add to arch/arm64/Makefie extra target "image_name" with dependency "KBUILD_IMAGE:=<proper path to Image.gz file>". Thus it will allow to set proper path to Image.gz file only for the "image_name" build target and this exact value will be picked up while rpm build install phase. Signed-off-by: Vadim Lomovtsev <redacted> --- arch/arm64/Makefile | 2 ++ 1 file changed, 2 insertions(+)diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index ab51aed..09926d3 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile@@ -101,6 +101,8 @@ all: $(KBUILD_IMAGE) $(KBUILD_DTBS) boot := arch/arm64/boot +image_name: KBUILD_IMAGE :=$(boot)/$(KBUILD_IMAGE) + Image: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
It might be worth fixing the other architectures that just set KBUILD_IMAGE to the filename too. Then you could remove the bodge from scripts/package/builddeb that tries to support both formats. Will