X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=0bcb0bf1072ea2e4dba9e94e2fd803de683a66a9;hb=e38182007fba883169ac354e92adeb27b3a44fdf;hp=1f8b87d0d8c16fba8f868025c68118ecbe23c86a;hpb=700f2190ad6408c32e020e0ce6e246311d65480e;p=linux-2.6.git

diff --git a/Makefile b/Makefile
index 1f8b87d0d..0bcb0bf10 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,15 @@ 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 .; \
 	 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 ; \
+	 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)
 
@@ -99,4 +104,4 @@ rpm: sources
 
 clean:
 	rm -f *.rpm
-	rm -rf BUILDROOT SOURCES SPECS SRPMS kernel-2.6.32 original tmp
+	rm -rf BUILDROOT SOURCES SPECS SRPMS kernel-2.6.32 tmp