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

diff --git a/Makefile b/Makefile
index 30594e80b..0cee0f320 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ SHA1SUM	= sha1sum
 SED	= sed
 
 # this is passed on the command line as the full path to <build>/SPECS/kernel.spec
-SPECFILE = kernel.spec
+SPECFILE = kernel-2.6.spec
 
 # Thierry - when called from within the build, PWD is /build
 PWD=$(shell pwd)
@@ -86,10 +86,14 @@ trees: sources
 srpm: sources
 	mkdir -p SOURCES SRPMS
 	(cd SOURCES; rpm2cpio ../$(SOURCE_RPM) | cpio -diu; \
-	 cp ../$(notdir $(SPECFILE)) . ; cp ../config-vserver . ; \
+	 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 ; \
-	 sed -i -e s,CONFIG_IPV6=m,CONFIG_IPV6=y, config-generic)
+	 cat config-planetlab >> config-generic ; \
+	 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)
 
@@ -99,3 +103,4 @@ rpm: sources
 
 clean:
 	rm -f *.rpm
+	rm -rf BUILDROOT SOURCES SPECS SRPMS kernel-2.6.32 tmp