Author: zbyniu Date: Mon Mar 17 22:13:03 2008 GMT Module: SPECS Tag: LINUX_2_6_22 ---- Log message: - fbsplash bcond repaired
---- Files affected: SPECS: kernel.spec (1.441.2.1796.2.67 -> 1.441.2.1796.2.68) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1796.2.67 SPECS/kernel.spec:1.441.2.1796.2.68 --- SPECS/kernel.spec:1.441.2.1796.2.67 Mon Mar 17 02:29:40 2008 +++ SPECS/kernel.spec Mon Mar 17 23:12:57 2008 @@ -294,7 +294,7 @@ # http://www.citi.umich.edu/projects/nfsv4/linux/kernel-patches/2.6.22-rc5-1/linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff Patch91: linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff -# based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.19-vs2.3.0.33.diff +# based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.19-vs2.3.0.34.diff Patch100: linux-2.6-vs2.3.patch Patch101: linux-2.6-vs2.1-suspend2.patch # based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.2-vs2.2.0.3.diff @@ -1233,10 +1233,15 @@ cat %{SOURCE47} >> arch/%{_target_base_arch}/defconfig %endif - # fbsplash +%if %{with fbsplash} echo "CONFIG_FB_SPLASH=y" >> arch/%{_target_base_arch}/defconfig - # bootsplash + sed -i "s:CONFIG_FB_TILEBLITTING=.:# CONFIG_FB_TILEBLITTING is not set:" arch/%{_target_base_arch}/defconfig + sed -i "s:CONFIG_FB_S3=.:# CONFIG_FB_S3 is not set:" arch/%{_target_base_arch}/defconfig + sed -i "s:CONFIG_FB_VT8623=.:# CONFIG_FB_VT8623 is not set:" arch/%{_target_base_arch}/defconfig + sed -i "s:CONFIG_FB_ARK=.:# CONFIG_FB_ARK is not set:" arch/%{_target_base_arch}/defconfig +%else echo "CONFIG_BOOTSPLASH=y" >> arch/%{_target_base_arch}/defconfig +%endif %if %{with nfsroot} sed -i "s:CONFIG_NFS_FS=m:CONFIG_NFS_FS=y:" arch/%{_target_base_arch}/defconfig @@ -1711,6 +1716,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.441.2.1796.2.68 2008-03-17 22:12:57 zbyniu +- fbsplash bcond repaired + Revision 1.441.2.1796.2.67 2008-03-17 01:29:40 zbyniu - vserver patch up to 2.3.0.33; rel 5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.67&r2=1.441.2.1796.2.68&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
