diff mbox series

[1/9] kbuild: rpm-pkg: remove ppc64 specific image handling

Message ID 1506733811-24636-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 6736ce27ce34d791ff2f030df6162527bd383a3c
Headers show
Series [1/9] kbuild: rpm-pkg: remove ppc64 specific image handling | expand

Commit Message

Masahiro Yamada Sept. 30, 2017, 1:10 a.m. UTC
This conditional was added by commit 1a0f3d422bb9 ("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 09549aa1baa9 ("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>

---

 scripts/package/mkspec | 5 -----
 1 file changed, 5 deletions(-)

-- 
2.7.4

Comments

Masahiro Yamada Oct. 9, 2017, 4:43 p.m. UTC | #1
2017-09-30 10:10 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> This conditional was added by commit 1a0f3d422bb9 ("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 09549aa1baa9 ("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>

> ---



The series, applied to linux-kbuild/misc.



-- 
Best Regards
Masahiro Yamada
diff mbox series

Patch

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index f47f17a..ef00750 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -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"