Commit 6736ce27 authored Sep 30, 2017 by Masahiro Yamada

kbuild: rpm-pkg: remove ppc64 specific image handling

This conditional was added by commit 1a0f3d42 ("kbuild: fix
make rpm for powerpc"). Its git-log explains the default kernel
image is zImage, but obviously the current arch/powerpc/Makefile
does not set KBUILD_IMAGE, so the image file is actually vmlinux.

Moreover, since commit 09549aa1 ("deb-pkg: Remove the KBUILD_IMAGE
workaround"), all architectures are supposed to set the full path to
the image in KBUILD_IMAGE. I see no good reason to differentiate
ppc64 from others. Rip off the conditional.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

parent 9e66317d

scripts/package/mkspec

+0 −5

Original line number	Diff line number	Diff line
		@@ -92,13 +92,8 @@ echo "%ifarch ia64"
		echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
		echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
		echo "%else"
		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 "%endif"
		echo "%endif"

		echo 'make %{?_smp_mflags} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install'
		echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"

Admin message