rpms/kernel/devel Makefile,1.89,1.90 config-rhel-generic,1.13,1.14

[Dave Jones]

Author: davej

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

Modified Files:
	Makefile config-rhel-generic 
Log Message:
do it as overrides instead for the simple cases


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Makefile	5 Nov 2008 17:56:53 -0000	1.89
+++ Makefile	5 Nov 2008 18:05:22 -0000	1.90
@@ -108,9 +108,6 @@
 rhel:
 	@perl -pi -e 's/# CONFIG_PPC_64K_PAGES is not set/CONFIG_PPC_64K_PAGES=y/' config-powerpc64
 	@perl -pi -e 's/CONFIG_NR_CPUS=64/CONFIG_NR_CPUS=512/' config-x86_64-generic
-	@perl -pi -e 's/CONFIG_HFS_FS=m/# CONFIG_HFS_FS is not set/' config-generic
-	@perl -pi -e 's/CONFIG_HFSPLUS_FS=m/# CONFIG_HFSPLUS_FS is not set/' config-generic
-	@perl -pi -e 's/CONFIG_BLK_DEV_NBD=m/# CONFIG_BLK_DEV_NBD is not set/' config-generic
 
 reconfig:
 	@rm -f kernel-*-config


Index: config-rhel-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-rhel-generic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-rhel-generic	10 Oct 2008 21:17:18 -0000	1.13
+++ config-rhel-generic	5 Nov 2008 18:05:22 -0000	1.14
@@ -90,6 +90,7 @@
 # CONFIG_DRM_SIS is not set
 
 # CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_NBD is not set`
 
 # CONFIG_MWAVE is not set
 
@@ -201,4 +202,6 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_9P_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set