Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / scripts / package / Makefile

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 3b1f2eff258448c2230e6ffe94484720795aff96..5e326078a4a2c351bc2a0c1319f8bdee76d554c0 100644 (file)
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -32,12 +32,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)/.
@@ -54,12 +53,12 @@ rpm-pkg rpm: $(objtree)/kernel.spec
 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
-       $(MAKE)
+
+binrpm-pkg: $(objtree)/binkernel.spec FORCE
+       $(MAKE) KBUILD_SRC=
        set -e; \
        $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
        set -e; \
@@ -71,19 +70,29 @@ clean-files += $(objtree)/binkernel.spec
 
 # Deb target
 # ---------------------------------------------------------------------------
-#
-.PHONY: deb-pkg
-deb-pkg:
-       $(MAKE)
+deb-pkg: FORCE
+       $(MAKE) KBUILD_SRC=
        $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
 
 clean-dirs += $(objtree)/debian/
 
 
+# tarball targets
+# ---------------------------------------------------------------------------
+tar%pkg: FORCE
+       $(MAKE) KBUILD_SRC=
+       $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
+
+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 & modules'
-       @echo  '  deb-pkg         - Build the kernel as an deb package'
+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'
+       @echo '  tarbz2-pkg      - Build the kernel as a bzip2 compressed tarball'