Author: lmasko Date: Wed Aug 18 13:54:30 2010 GMT
Module: packages Tag: Titanium
---- Log message:
- Reverted, on request of shadzik.
---- Files affected:
packages/kernel-desktop:
kernel-desktop.spec (1.204.2.126 -> 1.204.2.127)
---- Diffs:
================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.126
packages/kernel-desktop/kernel-desktop.spec:1.204.2.127
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.126 Wed Aug 18
15:04:39 2010
+++ packages/kernel-desktop/kernel-desktop.spec Wed Aug 18 15:54:25 2010
@@ -41,7 +41,6 @@
%{?debug:%define with_verbose 1}
-%define have_drm 1
%define have_oss 1
%define have_sound 1
%define have_isa 1
@@ -124,6 +123,7 @@
Requires: coreutils
Requires: geninitrd >= 2.57
Requires: module-init-tools >= 0.9.9
+Obsoletes: kernel%{_alt_kernel}-drm
Obsoletes: kernel%{_alt_kernel}-firmware
Obsoletes: kernel%{_alt_kernel}-isdn-mISDN
Obsoletes: kernel-misc-acer_acpi
@@ -255,25 +255,6 @@
%description vmlinux -l pl.UTF-8
vmlinux - rozpakowany obraz jądra.
-%package drm
-Summary: DRM kernel modules
-Summary(de.UTF-8): DRM Kernel Treiber
-Summary(pl.UTF-8): Sterowniki DRM
-Group: Base/Kernel
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: kernel-smp-drm
-Autoreqprov: no
-
-%description drm
-DRM kernel modules.
-
-%description drm -l de.UTF-8
-DRM Kernel Treiber.
-
-%description drm -l pl.UTF-8
-Sterowniki DRM.
-
%package pcmcia
Summary: PCMCIA modules
Summary(de.UTF-8): PCMCIA Module
@@ -701,8 +682,6 @@
%depmod %{kernel_release}
-%posttrans
-# generate initrd after all dependant modules are installed
/sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz
%{kernel_release}
mv -f %{initrd_dir}/initrd-%{alt_kernel}
%{initrd_dir}/initrd-%{alt_kernel}.old 2> /dev/null > /dev/null
ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
@@ -733,12 +712,6 @@
mv -f /boot/vmlinux-%{alt_kernel} /boot/vmlinux-%{alt_kernel}.old 2> /dev/null
> /dev/null
ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}
-%post drm
-%depmod %{kernel_release}
-
-%postun drm
-%depmod %{kernel_release}
-
%post pcmcia
%depmod %{kernel_release}
@@ -789,9 +762,6 @@
/lib/modules/%{kernel_release}/kernel/arch
/lib/modules/%{kernel_release}/kernel/crypto
/lib/modules/%{kernel_release}/kernel/drivers
-%if %{have_drm}
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu/drm
-%endif
/lib/modules/%{kernel_release}/kernel/fs
# this directory will be removed after disabling rcutorture mod. in 2.6.20.
@@ -840,12 +810,6 @@
%defattr(644,root,root,755)
/boot/vmlinux-%{kernel_release}
-%if %{have_drm}
-%files drm
-%defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/gpu/drm
-%endif
-
%if %{with pcmcia}
%files pcmcia
%defattr(644,root,root,755)
@@ -991,6 +955,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.204.2.127 2010/08/18 13:54:25 lmasko
+- Reverted, on request of shadzik.
+
Revision 1.204.2.126 2010/08/18 13:04:39 lmasko
- Reverted patches from release 1.204.2.120.
- Adjusted generation of initrd in the same way as in kernel.spec.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop.spec?r1=1.204.2.126&r2=1.204.2.127&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
