2015-04-18 22:05:19

by Borislav Petkov

Subject: [PATCH] kbuild/mkspec: Simplify vmlinux.bz2 creation

From: Borislav Petkov <[email protected]>

No need for the intermediary vmlinux.orig - bzip2 can keep the original
files used for compression with --keep.

Signed-off-by: Borislav Petkov <[email protected]>
Cc: Michal Marek <[email protected]>
Cc: [email protected]
---
scripts/package/mkspec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index d9ab94b17de0..89f9669d4f00 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -111,10 +111,8 @@ echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$KERNELRELEASE"

echo "%ifnarch ppc64"
-echo 'cp vmlinux vmlinux.orig'
-echo 'bzip2 -9 vmlinux'
+echo 'bzip2 -9 --keep vmlinux'
echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
-echo 'mv vmlinux.orig vmlinux'
echo "%endif"

if ! $PREBUILT; then
--
2.3.5

2015-04-22 14:28:28

by Michal Marek

Subject: Re: [PATCH] kbuild/mkspec: Simplify vmlinux.bz2 creation

On Sun, Apr 19, 2015 at 12:05:14AM +0200, Borislav Petkov wrote:
> From: Borislav Petkov <[email protected]>
>
> No need for the intermediary vmlinux.orig - bzip2 can keep the original
> files used for compression with --keep.
>
> Signed-off-by: Borislav Petkov <[email protected]>
> Cc: Michal Marek <[email protected]>
> Cc: [email protected]

Applied to kbuild.git#misc. I will push it after v4.1-rc1 becomes
available, though.

Michal