On some architectures, such as arm64, KBUILD_IMAGE is not a full path but instead just the build target. The builddeb script handles this case correctly today and will try arch/$ARCH/boot/$KBUILD_IMAGE so we can just borrow that logic and adapt it slightly for spec file syntax. Cc: Michal Marek <mmarek@xxxxxxxx> Cc: linux-kbuild@xxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Signed-off-by: Tom Rini <trini@xxxxxxxxxxxx> --- It is currently a mixed-bag on if architectures will use a build target (arm, arm64, arc are certainly by inspection and a few others 'may') or a full path (x86, blackfin, s390). Given that builddeb gets this case correct, I think changing mkspec is the right way to go here. --- scripts/package/mkspec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/package/mkspec b/scripts/package/mkspec index bb43f153fd8e..aa5f3db43f12 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -101,7 +101,11 @@ echo "%ifarch ppc64" echo "cp vmlinux arch/powerpc/boot" echo "cp arch/powerpc/boot/"'$KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE" echo "%else" -echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE" +echo "if [ -e $KBUILD_IMAGE ]; then" +echo ' cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE" +echo "else" +echo ' cp arch/$ARCH/boot/$KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE" +echo "fi" echo "%endif" echo "%endif" -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
