packages: kernel/kernel.spec - fix arm zImage install (noted by pawelz on d...

glen glen at pld-linux.org
Thu Sep 2 20:28:58 CEST 2010


Author: glen                         Date: Thu Sep  2 18:28:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix arm zImage install (noted by pawelz on devel-en)

---- Files affected:
packages/kernel:
   kernel.spec (1.813 -> 1.814) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.813 packages/kernel/kernel.spec:1.814
--- packages/kernel/kernel.spec:1.813	Mon Aug 30 20:46:29 2010
+++ packages/kernel/kernel.spec	Thu Sep  2 20:28:52 2010
@@ -1137,33 +1137,33 @@
 install -d $RPM_BUILD_ROOT/boot
 cp -a %{objdir}/System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release}
 %ifarch %{ix86} %{x8664}
-cp -a %{objdir}/arch/%{target_arch_dir}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
+	cp -a %{objdir}/arch/%{target_arch_dir}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+	install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 %endif
 %ifarch ppc ppc64
-install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
+	install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+	install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 %endif
 %ifarch ia64
-%{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
-cp -a %{objdir}/vmlinuz $RPM_BUILD_ROOT/boot/efi/vmlinuz-%{kernel_release}
-ln -sf efi/vmlinuz-%{kernel_release} $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+	%{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
+	cp -a %{objdir}/vmlinuz $RPM_BUILD_ROOT/boot/efi/vmlinuz-%{kernel_release}
+	ln -sf efi/vmlinuz-%{kernel_release} $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
 %endif
 %ifarch alpha sparc sparc64
 	%{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
 	cp -a %{objdir}/vmlinuz $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-	install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-%ifarch sparc
-	elftoaout %{objdir}/arch/sparc/boot/image -o %{objdir}/vmlinux.aout
-	install %{objdir}/vmlinux.aout $RPM_BUILD_ROOT/boot/vmlinux.aout-%{kernel_release}
-%endif
-%ifarch sparc64
-	elftoaout %{objdir}/arch/sparc64/boot/image -o %{objdir}/vmlinux.aout
-	install %{objdir}/vmlinux.aout $RPM_BUILD_ROOT/boot/vmlinux.aout-%{kernel_release}
+	install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+	%ifarch sparc
+		elftoaout %{objdir}/arch/sparc/boot/image -o %{objdir}/vmlinux.aout
+		install -p %{objdir}/vmlinux.aout $RPM_BUILD_ROOT/boot/vmlinux.aout-%{kernel_release}
+	%endif
+	%ifarch sparc64
+		elftoaout %{objdir}/arch/sparc64/boot/image -o %{objdir}/vmlinux.aout
+		install -p %{objdir}/vmlinux.aout $RPM_BUILD_ROOT/boot/vmlinux.aout-%{kernel_release}
+	%endif
 %endif
 %ifarch arm
-	install %{objdir}/arch/arm/boot/zImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-%endif
+	install -p %{objdir}/arch/arm/boot/zImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
 %endif
 
 # ghosted initrd
@@ -1592,6 +1592,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.814  2010/09/02 18:28:52  glen
+- fix arm zImage install (noted by pawelz on devel-en)
+
 Revision 1.813  2010/08/30 18:46:29  glen
 - re-add kernel-TIOCGDEV.patch, from 2.6.22, used by blogd from showconsole
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.813&r2=1.814&f=u



More information about the pld-cvs-commit mailing list