Author: glen Date: Thu Sep 2 18:25:55 2010 GMT
Module: packages Tag: LINUX_2_6_34
---- Log message:
- fix arm zImage install (noted by pawelz on devel-en)
---- Files affected:
packages/kernel:
kernel.spec (1.798.2.10 -> 1.798.2.11)
---- Diffs:
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.798.2.10
packages/kernel/kernel.spec:1.798.2.11
--- packages/kernel/kernel.spec:1.798.2.10 Mon Aug 30 20:46:58 2010
+++ packages/kernel/kernel.spec Thu Sep 2 20:25:49 2010
@@ -1156,34 +1156,34 @@
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 %{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 %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+ install %{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}
+ %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}
+ %endif
%endif
%ifarch arm
install %{objdir}/arch/arm/boot/zImage
$RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
%endif
-%endif
# ghosted initrd
touch $RPM_BUILD_ROOT%{initrd_dir}/initrd-%{kernel_release}.gz
@@ -1611,6 +1611,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.798.2.11 2010/09/02 18:25:49 glen
+- fix arm zImage install (noted by pawelz on devel-en)
+
Revision 1.798.2.10 2010/08/30 18:46:58 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.798.2.10&r2=1.798.2.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
