Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

[pandora-kernel.git] / scripts / package / Makefile

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index f3e7e8e..8c6b7b0 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:
@@ -32,12 +28,11 @@ MKSPEC     := $(srctree)/scripts/package/mkspec
 PREV       := set -e; cd ..;
 
 # rpm-pkg
-.PHONY: rpm-pkg rpm
-
+# ---------------------------------------------------------------------------
 $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
        $(CONFIG_SHELL) $(MKSPEC) > $@
 
-rpm-pkg rpm: $(objtree)/kernel.spec
+rpm-pkg rpm: $(objtree)/kernel.spec FORCE
        $(MAKE) clean
        $(PREV) ln -sf $(srctree) $(KERNELPATH)
        $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
@@ -48,32 +43,31 @@ rpm-pkg rpm: $(objtree)/kernel.spec
        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
 
 # binrpm-pkg
-.PHONY: binrpm-pkg
+# ---------------------------------------------------------------------------
 $(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile
        $(CONFIG_SHELL) $(MKSPEC) prebuilt > $@
-       
-binrpm-pkg: $(objtree)/binkernel.spec
+
+binrpm-pkg: $(objtree)/binkernel.spec FORCE
        $(MAKE) KBUILD_SRC=
        set -e; \
        $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
        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
 
 # Deb target
 # ---------------------------------------------------------------------------
-#
-.PHONY: deb-pkg
-deb-pkg:
+deb-pkg: FORCE
        $(MAKE) KBUILD_SRC=
        $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
 
@@ -82,9 +76,8 @@ clean-dirs += $(objtree)/debian/
 
 # tarball targets
 # ---------------------------------------------------------------------------
-.PHONY: tar%pkg
-tar%pkg:
-       $(MAKE)
+tar%pkg: FORCE
+       $(MAKE) KBUILD_SRC=
        $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
 
 clean-dirs += $(objtree)/tar-install/
@@ -92,10 +85,9 @@ clean-dirs += $(objtree)/tar-install/
 
 # Help text displayed when executing 'make help'
 # ---------------------------------------------------------------------------
-help:
-       @echo '  rpm-pkg         - Build the kernel as an RPM package'
-       @echo '  binrpm-pkg      - Build an rpm package containing the compiled kernel'
-       @echo '                    and modules'
+help: FORCE
+       @echo '  rpm-pkg         - Build both source and binary RPM kernel packages'
+       @echo '  binrpm-pkg      - Build only the binary kernel package'
        @echo '  deb-pkg         - Build the kernel as an deb package'
        @echo '  tar-pkg         - Build the kernel as an uncompressed tarball'
        @echo '  targz-pkg       - Build the kernel as a gzip compressed tarball'