Setting tag linux-2.6-32-14

[linux-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index 0cee0f3..4149dee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -86,14 +86,11 @@ 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,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)
+        cat config-planetlab >> config-generic)
+       ./modify_rh_config.sh
        ./rpmmacros.sh
        export HOME=$(shell pwd) ; rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bs $(SPECFILE)