X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=0cee0f320c99e317ea8226b143436b9848441410;hb=f77a3de7873df5e7dc67a54d7d29335250b03d14;hp=e329d0ce9a93f16b648518b31737d948e9697ad2;hpb=d3444a423880c1556e1f9ed25f28cf7c7330a856;p=linux-2.6.git

diff --git a/Makefile b/Makefile
index e329d0ce9..0cee0f320 100644
--- a/Makefile
+++ b/Makefile
@@ -86,12 +86,14 @@ 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 ../$(notdir $(SPECFILE)) . ; cp ../linux-*.patch .; cp ../config-vserver . ; cp ../config-planetlab .; cp ../config-workarounds .; \
 	 for downloaded in $(SOURCEFILES) ; do cp ../$$downloaded . ; done ; \
 	 cat config-vserver >> config-generic ; \
 	 cat config-planetlab >> 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)
+	 cat config-workarounds >> config-generic ; \
+	 sed -i -e "s,CONFIG_IPV6=m,CONFIG_IPV6=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)