Skip to content

Commit c398ff0

Browse files
mmarcinimichal42
authored andcommitted
kbuild: fix error when building from src rpm
The following issue can be reproduced with Linus' tree on an x86_64 server. >+ cp /home/user/rpmbuild-test/BUILDROOT/kernel-3.9.2.x86_64/boot/vmlinuz-3.9.2 >cp: missing destination file operand after >/home/user/rpmbuild-test/BUILDROOT/kernel-3.9.2-1.x86_64/boot/vmlinuz-3.9.2' >Try `cp --help' for more information. >error: Bad exit status from /var/tmp/rpm-tmp.R4o0iI (%install) Here are the commands to reproduce: make defconfig make rpm-pkg Use the resulting src rpm to build as follows: mkdir ~/rpmbuild-test cd ~/rpmbuild-test rpmbuild --rebuild --define "_topdir `pwd`" -vv ~/rpmbuild/SRPMS/kernel-3.10.0_rc1+-1.src.rpm The issue is because the %install script uses $KBUILD_IMAGE and it hasn't been set since it is only available in the kbuild system and not in the %install script. This patch adds a Makefile target to emit the image_name that can be used and modifies the mkspec to use the dynamic name in %install. Signed-off-by: Mike Marciniszyn <[email protected]> Signed-off-by: Michal Marek <[email protected]>
1 parent cdf2bc6 commit c398ff0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,6 +1116,7 @@ help:
11161116
@echo ' gtags - Generate GNU GLOBAL index'
11171117
@echo ' kernelrelease - Output the release version string'
11181118
@echo ' kernelversion - Output the version stored in Makefile'
1119+
@echo ' image_name - Output the image name'
11191120
@echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
11201121
echo ' (default: $(INSTALL_HDR_PATH))'; \
11211122
echo ''
@@ -1310,7 +1311,7 @@ export_report:
13101311
endif #ifeq ($(config-targets),1)
13111312
endif #ifeq ($(mixed-targets),1)
13121313

1313-
PHONY += checkstack kernelrelease kernelversion
1314+
PHONY += checkstack kernelrelease kernelversion image_name
13141315

13151316
# UML needs a little special treatment here. It wants to use the host
13161317
# toolchain, so needs $(SUBARCH) passed to checkstack.pl. Everyone
@@ -1331,6 +1332,9 @@ kernelrelease:
13311332
kernelversion:
13321333
@echo $(KERNELVERSION)
13331334

1335+
image_name:
1336+
@echo $(KBUILD_IMAGE)
1337+
13341338
# Clear a bunch of variables before executing the submake
13351339
tools/: FORCE
13361340
$(Q)mkdir -p $(objtree)/tools

scripts/package/mkspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ echo ""
7474
fi
7575

7676
echo "%install"
77+
echo 'KBUILD_IMAGE=$(make image_name)'
7778
echo "%ifarch ia64"
7879
echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'
7980
echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'

0 commit comments

Comments
 (0)