Author: zbyniu Date: Mon Mar 17 22:09:25 2008 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - fbsplash bcond repaired
---- Files affected: SPECS: kernel.spec (1.441.2.1852 -> 1.441.2.1853) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1852 SPECS/kernel.spec:1.441.2.1853 --- SPECS/kernel.spec:1.441.2.1852 Thu Mar 13 20:31:51 2008 +++ SPECS/kernel.spec Mon Mar 17 23:09:19 2008 @@ -115,7 +115,7 @@ %define _prepatch %{nil} %define _pre_rc %{nil} %define _rc %{nil} -%define _rel 0.2 +%define _rel 0.3 %define subname %{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_rescuecd:-rescuecd} %define _enable_debug_packages 0 @@ -1201,9 +1201,16 @@ cat %{SOURCE47} >> arch/%{target_arch_dir}/defconfig %endif - # fbsplash && bootsplash +%if %{with fbsplash} echo "CONFIG_FB_SPLASH=y" >> arch/%{target_arch_dir}/defconfig + sed -i "s:CONFIG_FB_TILEBLITTING=.:# CONFIG_FB_TILEBLITTING is not set:" arch/%{target_arch_dir}/defconfig + sed -i "s:CONFIG_FB_S3=.:# CONFIG_FB_S3 is not set:" arch/%{target_arch_dir}/defconfig + sed -i "s:CONFIG_FB_VT8623=.:# CONFIG_FB_VT8623 is not set:" arch/%{target_arch_dir}/defconfig + sed -i "s:CONFIG_FB_MATROX=.:# CONFIG_FB_MATROX is not set:" arch/%{target_arch_dir}/defconfig + sed -i "s:CONFIG_FB_ARK=.:# CONFIG_FB_ARK is not set:" arch/%{target_arch_dir}/defconfig +%else echo "CONFIG_BOOTSPLASH=y" >> arch/%{target_arch_dir}/defconfig +%endif %if %{with nfsroot} sed -i "s:CONFIG_NFS_FS=m:CONFIG_NFS_FS=y:" arch/%{target_arch_dir}/defconfig @@ -1675,6 +1682,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.441.2.1853 2008-03-17 22:09:19 zbyniu +- fbsplash bcond repaired + Revision 1.441.2.1852 2008-03-13 19:31:51 zbyniu - rtsp-conntrack/nat is back ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1852&r2=1.441.2.1853&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit