Author: glen Date: Sat Feb 5 17:22:31 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- update initrd and boot loaders in posttrans so modules like nouveau are
available from dependant packages, also fixes grub loader seeing about to be
removed kernel images
- load grub config in subshell to avoid variable clobbering
- conflict with older rpm without working posttrans support
---- Files affected:
packages/kernel-vanilla:
kernel-vanilla.spec (1.230 -> 1.231)
---- Diffs:
================================================================
Index: packages/kernel-vanilla/kernel-vanilla.spec
diff -u packages/kernel-vanilla/kernel-vanilla.spec:1.230
packages/kernel-vanilla/kernel-vanilla.spec:1.231
--- packages/kernel-vanilla/kernel-vanilla.spec:1.230 Sat Feb 5 12:18:31 2011
+++ packages/kernel-vanilla/kernel-vanilla.spec Sat Feb 5 18:22:25 2011
@@ -119,6 +119,7 @@
Conflicts: procps < 3.2.0
Conflicts: quota-tools < 3.09
Conflicts: reiserfsprogs < 3.6.3
+Conflicts: rpm < 4.4.2-0.2
Conflicts: udev < 1:071
Conflicts: util-linux < 2.10o
Conflicts: xfsprogs < 2.6.0
@@ -297,7 +298,7 @@
%package firmware
Summary: Firmware for Linux kernel drivers
Summary(pl.UTF-8): Firmware dla sterowników z jądra Linuksa
-Group: System Environment/Kernel
+Group: Base/Kernel
%description firmware
Firmware for Linux kernel drivers.
@@ -333,8 +334,8 @@
%description headers -l de.UTF-8
Dies sind die C Header Dateien für den Linux-Kernel, die definierte
-Strukturen und Konstante beinhalten, die beim rekompilieren des Kernels
-oder bei Kernel Modul kompilationen gebraucht werden.
+Strukturen und Konstante beinhalten, die beim rekompilieren des
+Kernels oder bei Kernel Modul kompilationen gebraucht werden.
%description headers -l pl.UTF-8
Pakiet zawiera pliki nagłówkowe jądra, niezbędne do rekompilacji jądra
@@ -616,20 +617,21 @@
%depmod %{kernel_release}
+%posttrans
+# generate initrd after all dependant modules are installed
/sbin/geninitrd -f --initrdfs=initramfs
%{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
-if [ -x /sbin/new-kernel-pkg ]; then
- if [ -f /etc/pld-release ]; then
- title=$(sed 's/^[0-9.]\+ //' < /etc/pld-release)
- else
- title='PLD Linux'
+# update boot loaders when old package files are gone from filesystem
+if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
+ if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-no})" = "yes" ]; then
+ /sbin/update-grub >/dev/null
fi
-
- title="$title %{alt_kernel}"
-
- /sbin/new-kernel-pkg
--initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install
%{kernel_release} --banner "$title"
-elif [ -x /sbin/rc-boot ]; then
+fi
+if [ -x /sbin/new-kernel-pkg ]; then
+ /sbin/new-kernel-pkg
--initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install
%{kernel_release} --banner "PLD Linux (%{pld_release})%{?alt_kernel: /
%{alt_kernel}}"
+fi
+if [ -x /sbin/rc-boot ]; then
/sbin/rc-boot 1>&2 || :
fi
@@ -783,6 +785,7 @@
%endif # %{have_sound}
%files firmware
+%defattr(644,root,root,755)
%dir /lib/firmware/3com
/lib/firmware/3com/3C359.bin
/lib/firmware/3com/typhoon.bin
@@ -1017,6 +1020,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.231 2011/02/05 17:22:25 glen
+- update initrd and boot loaders in posttrans so modules like nouveau are
+ available from dependant packages, also fixes grub loader seeing about to be
+ removed kernel images
+- load grub config in subshell to avoid variable clobbering
+- conflict with older rpm without working posttrans support
+
Revision 1.230 2011/02/05 11:18:31 glen
- install -j1 (firmware install fails otherwise)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-vanilla/kernel-vanilla.spec?r1=1.230&r2=1.231&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
