X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=0bcb0bf1072ea2e4dba9e94e2fd803de683a66a9;hb=15764e1bcadb162e5fdd0860458578d893e9ed97;hp=354d00c7f058f356039dd7009e24a4573506d4ac;hpb=aa698a32ee59e5881a3aa3edb58bd3c5dc69f0da;p=linux-2.6.git

diff --git a/Makefile b/Makefile
index 354d00c7f..0bcb0bf10 100644
--- a/Makefile
+++ b/Makefile
@@ -86,13 +86,15 @@ trees: sources
 srpm: sources
 	mkdir -p SOURCES SRPMS
 	(cd SOURCES; rpm2cpio ../$(SOURCE_RPM) | cpio -diu; \
-	 cp ../$(notdir $(SPECFILE)) . ; cp ../linux-*.patch .; cp ../config-vserver . ; cp ../config-planetlab .; cp ../config-workarounds .; \
+	 cp ../$(notdir $(SPECFILE)) . ; cp ../linux-*.patch .; cp ../config-vserver . ; cp ../config-planetlab .; \
 	 for downloaded in $(SOURCEFILES) ; do cp ../$$downloaded . ; done ; \
 	 cat config-vserver >> config-generic ; \
 	 cat config-planetlab >> config-generic ; \
-	 cat config-workarounds >> config-generic ; \
-	 sed -i -e s,CONFIG_IPV6=m,CONFIG_IPV6=y, config-generic ;\
-	 sed -e -e s,CONFIG_MODULE_SIG=y,CONFIG_MODULE_SIG=n, config-generic-rhel)
+	 sed -i -e "s,CONFIG_IPV6=m,CONFIG_IPV6=y,g" config-generic ;\
+	 sed -i -e "s,# CONFIG_SYSFS_DEPRECATED is not set,CONFIG_SYSFS_DEPRECATED=y,g" config-generic ;\
+	 sed -i -e "s,# CONFIG_SYSFS_DEPRECATED_V2 is not set,CONFIG_SYSFS_DEPRECATED_V2=y,g" config-generic ;\
+	 sed -i -e "s,CONFIG_MODULE_SIG=y,CONFIG_MODULE_SIG=n,g" config-generic-rhel ;\
+	 sed -i -e "/\# CONFIG_KVM is not set/d" config-x86-generic-rhel)
 	./rpmmacros.sh
 	export HOME=$(shell pwd) ; rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bs $(SPECFILE)