rpms/kernel/devel config-generic, 1.238.6.14, 1.238.6.15 kernel.spec, 1.1294.2.17, 1.1294.2.18

[Michael Young]

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2076

Modified Files:
      Tag: private-myoung-dom0-branch
	config-generic kernel.spec 
Log Message:
Building both squashfs 3 and squashfs 4 doesn't work so disable 3



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.14
retrieving revision 1.238.6.15
diff -u -r1.238.6.14 -r1.238.6.15
--- config-generic	30 Mar 2009 19:45:43 -0000	1.238.6.14
+++ config-generic	30 Mar 2009 20:19:11 -0000	1.238.6.15
@@ -3883,5 +3883,5 @@
 # CONFIG_X86_CPU_DEBUG is not set
 # CONFIG_KEXEC_JUMP is not set
 # CONFIG_FTRACE_SYSCALLS is not set
-CONFIG_SQUASHFS3=m
+# CONFIG_SQUASHFS3 is not set
 # CONFIG_SQUASHFS3_EMBEDDED is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.17
retrieving revision 1.1294.2.18
diff -u -r1.1294.2.17 -r1.1294.2.18
--- kernel.spec	30 Mar 2009 19:45:44 -0000	1.1294.2.17
+++ kernel.spec	30 Mar 2009 20:19:11 -0000	1.1294.2.18
@@ -1861,6 +1861,7 @@
 %changelog
 * Mon Mar 30 2009 Michael Young <m.a.young at durham.ac.uk>
 - pvops update and merging of patches
+- disable squashfs 3 again since we can't build both versions at the same time
 
 * Mon Mar 30 2009 Adam Jackson <ajax at redhat.com>
 - linux-2.6.29-pat-fixes.patch: Fix PAT/GTT interaction