Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6

[~andy/linux] / scripts / package / Makefile

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 5e326078a4a2c351bc2a0c1319f8bdee76d554c0..8c6b7b09606acb150b2e3c7b26ccb4074950498f 100644 (file)
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -1,10 +1,6 @@
 # Makefile for the different targets used to generate full packages of a kernel
 # It uses the generic clean infrastructure of kbuild
 
-# Ignore the following files/directories during tar operation
-TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS
-
-
 # RPM target
 # ---------------------------------------------------------------------------
 # The rpm target generates two rpm files:
@@ -47,7 +43,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE
        set -e; \
        mv -f $(objtree)/.tmp_version $(objtree)/.version
 
-       $(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
+       $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
        rm ../$(KERNELPATH).tar.gz
 
 clean-files := $(objtree)/kernel.spec
@@ -64,7 +60,8 @@ binrpm-pkg: $(objtree)/binkernel.spec FORCE
        set -e; \
        mv -f $(objtree)/.tmp_version $(objtree)/.version
 
-       $(RPM) --define "_builddir $(srctree)" --target $(UTS_MACHINE) -bb $<
+       $(RPM) $(RPMOPTS) --define "_builddir $(srctree)" --target \
+               $(UTS_MACHINE) -bb $<
 
 clean-files += $(objtree)/binkernel.spec