SPECS (LINUX_2_6): kernel.spec - vmlinux separation cleanup
qboosh
qboosh at pld-linux.org
Mon Feb 20 11:26:08 CET 2006
Author: qboosh Date: Mon Feb 20 10:26:08 2006 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- vmlinux separation cleanup
---- Files affected:
SPECS:
kernel.spec (1.441.2.1403 -> 1.441.2.1404)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1403 SPECS/kernel.spec:1.441.2.1404
--- SPECS/kernel.spec:1.441.2.1403 Sun Feb 19 22:16:14 2006
+++ SPECS/kernel.spec Mon Feb 20 11:26:01 2006
@@ -1,9 +1,9 @@
# $Revision$, $Date$
#
# TODO:
-#
-# - add distcc support (and don't break crossbuild!)
-# - move em8300 stuff to separeated specs
+# - add distcc support (and don't break crossbuild!)
+# - move em8300 stuff to separeated specs
+# - what is the sense of packaging uncompressed vmlinuz (=vmlinux) on ppc*?
#
# Conditional build:
%bcond_without smp # don't build SMP kernel
@@ -456,14 +456,16 @@
Twojego komputera. Zawiera w sobie sterowniki do sprzętu znajdującego
się w komputerze, takiego jak sterowniki dysków itp.
-
%package vmlinux
-Summary: kernel vmlinux file
-Summary(pl): plik vmlinux
+Summary: vmlinux - uncompressed kernel image
+Summary(pl): vmlinux - rozpakowany obraz jądra
Group: Base/Kernel
%description vmlinux
+vmlinux - uncompressed kernel image.
+
%description vmlinux -l pl
+vmlinux - rozpakowany obraz jądra.
%package drm
Summary: DRM kernel modules
@@ -601,12 +603,15 @@
Powinno również dobrze działać na maszynach z jednym procesorem.
%package smp-vmlinux
-Summary: kernel SMP vmlinux file
-Summary(pl): plik SMP vmlinux
+Summary: vmlinux - uncompressed SMP kernel image
+Summary(pl): vmlinux - rozpakowany obraz jądra SMP
Group: Base/Kernel
%description smp-vmlinux
+vmlinux - uncompressed SMP kernel image.
+
%description smp-vmlinux -l pl
+vmlinux - rozpakowany obraz jądra SMP.
%package smp-drm
Summary: DRM SMP kernel modules
@@ -1367,13 +1372,11 @@
%ifarch ia64
mv -f /boot/efi/vmlinuz /boot/efi/vmlinuz.old 2> /dev/null > /dev/null
%endif
-mv -f /boot/vmlinux /boot/vmlinux.old 2> /dev/null > /dev/null
mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
%ifarch ia64
ln -sf vmlinuz-%{version}-%{release} /boot/efi/vmlinuz
%endif
-ln -sf vmlinux-%{version}-%{release} /boot/vmlinux
ln -sf vmlinuz-%{version}-%{release} /boot/vmlinuz
ln -sf System.map-%{version}-%{release} /boot/System.map
@@ -1400,6 +1403,10 @@
/sbin/rc-boot 1>&2 || :
fi
+%post vmlinux
+mv -f /boot/vmlinux /boot/vmlinux.old 2> /dev/null > /dev/null
+ln -sf vmlinux-%{version}-%{release} /boot/vmlinux
+
%post libs
%{_sbindir}/mkvmlinuz /boot/zImage-%{version}-%{release} %{version}-%{release}
@@ -1437,13 +1444,11 @@
%ifarch ia64
mv -f /boot/efi/vmlinuz /boot/efi/vmlinuz.old 2> /dev/null > /dev/null
%endif
-mv -f /boot/vmlinux /boot/vmlinux.old 2> /dev/null > /dev/null
mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
%ifarch ia64
ln -sf vmlinuz-%{version}-%{release}smp /boot/efi/vmlinuz
%endif
-ln -sf vmlinux-%{version}-%{release}smp /boot/vmlinux
ln -sf vmlinuz-%{version}-%{release}smp /boot/vmlinuz
ln -sf System.map-%{version}-%{release}smp /boot/System.map
@@ -1470,6 +1475,10 @@
/sbin/rc-boot 1>&2 || :
fi
+%post smp-vmlinux
+mv -f /boot/vmlinux /boot/vmlinux.old 2> /dev/null > /dev/null
+ln -sf vmlinux-%{version}-%{release}smp /boot/vmlinux
+
%post smp-libs
%{_sbindir}/mkvmlinuz /boot/zImage-%{version}-%{release}smp %{version}-%{release}smp
@@ -1512,18 +1521,12 @@
fi
%if %{with up}
-%files vmlinux
+%files
%defattr(644,root,root,755)
-%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
-/boot/vmlinux-%{version}-%{release}
-%endif
+%doc FAQ-pl
%ifarch sparc sparc64
/boot/vmlinux.aout-%{version}-%{release}
%endif
-
-%files
-%defattr(644,root,root,755)
-%doc FAQ-pl
%ifarch ia64
/boot/efi/vmlinuz-%{version}-%{release}
%endif
@@ -1573,6 +1576,12 @@
%ghost /lib/modules/%{version}-%{release}/modules.*
%dir %{_sysconfdir}/modprobe.d/%{version}-%{release}
+%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
+%files vmlinux
+%defattr(644,root,root,755)
+/boot/vmlinux-%{version}-%{release}
+%endif
+
%if %{have_drm}
%files drm
%defattr(644,root,root,755)
@@ -1634,18 +1643,12 @@
%endif # %%{with up}
%if %{with smp}
-%files smp-vmlinux
+%files smp
%defattr(644,root,root,755)
-%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
-/boot/vmlinux-%{version}-%{release}smp
-%endif
+%doc FAQ-pl
%ifarch ia64
/boot/efi/vmlinuz-%{version}-%{release}smp
%endif
-
-%files smp
-%defattr(644,root,root,755)
-%doc FAQ-pl
/boot/vmlinuz-%{version}-%{release}smp
/boot/System.map-%{version}-%{release}smp
%ghost /boot/initrd-%{version}-%{release}smp.gz
@@ -1692,6 +1695,12 @@
%ghost /lib/modules/%{version}-%{release}smp/modules.*
%dir %{_sysconfdir}/modprobe.d/%{version}-%{release}smp
+%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
+%files smp-vmlinux
+%defattr(644,root,root,755)
+/boot/vmlinux-%{version}-%{release}smp
+%endif
+
%if %{have_drm}
%files smp-drm
%defattr(644,root,root,755)
@@ -1838,6 +1847,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1404 2006/02/20 10:26:01 qboosh
+- vmlinux separation cleanup
+
Revision 1.441.2.1403 2006/02/19 21:16:14 sparky
- realtime preemptive updated and partially fixed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1403&r2=1.441.2.1404&f=u
More information about the pld-cvs-commit
mailing list