Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull misc kbuild updates from Michal Marek:
 "Non-critical kbuild changes:

   - make coccicheck improvements, but no new semantic patches this time

   - make rpm improvements

   - make tar-pkg change to include the architecture in the filename.

     This is a deliberate incompatibility, but nobody has complained so
     far and it is useful if you build for different architectures.  It
     also matches what the deb-pkg and rpm-pkg targets produce.

   - kbuild documentation fix"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  rpm-pkg: Remove pointless set -e statements
  rpm-pkg: Always regenerate the specfile
  rpm-pkg: Do not write to the parent directory
  rpm-pkg: Do not package the whole source directory
  buildtar: Add ARCH to the archive name
  Coccinelle: Fix patch output when coccicheck is used with M= and C=
  Coccinelle: Add support to the SPFLAGS variable
  Coccinelle: Cleanup the setting of the FLAGS and OPTIONS variables
  Coccinelle: Restore coccicheck verbosity in ONLINE mode (C=1 or C=2)
  scripts/package/Makefile: compare objtree with srctree instead of test KBUILD_OUTPUT
  doc: change example to existing Makefile fragment
  scripts/tags.sh: Add magic for OFFSET and DEFINE

1 files changed, 15 insertions, 24 deletions

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 87bf08076b11..84a406070f6f 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -27,53 +27,44 @@ RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
 
 # Remove hyphens since they have special meaning in RPM filenames
 KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
+# Include only those top-level files that are needed by make, plus the GPL copy
+TAR_CONTENT := $(KBUILD_ALLDIRS) kernel.spec .config .scmversion Makefile \
+               Kbuild Kconfig COPYING $(wildcard localversion*)
+TAR_CONTENT := $(addprefix $(KERNELPATH)/,$(TAR_CONTENT))
 MKSPEC     := $(srctree)/scripts/package/mkspec
-PREV       := set -e; cd -P ..;
 
 # rpm-pkg
 # ---------------------------------------------------------------------------
-$(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
-        $(CONFIG_SHELL) $(MKSPEC) > $@
-
-rpm-pkg rpm: $(objtree)/kernel.spec FORCE
-        @if test -n "$(KBUILD_OUTPUT)"; then \
+rpm-pkg rpm: FORCE
+        @if test "$(objtree)" != "$(srctree)"; then \
                 echo "Building source + binary RPM is not possible outside the"; \
                 echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \
                 echo "binrpm-pkg target instead."; \
                 false; \
         fi
         $(MAKE) clean
-        $(PREV) ln -sf $(srctree) $(KERNELPATH)
+        ln -sf $(srctree) $(KERNELPATH)
+        $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
         $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
-        $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
-        $(PREV) rm $(KERNELPATH)
+        tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT)
+        rm $(KERNELPATH)
         rm -f $(objtree)/.scmversion
-        set -e; \
         $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
-        set -e; \
         mv -f $(objtree)/.tmp_version $(objtree)/.version
-
-        $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
-        rm ../$(KERNELPATH).tar.gz
-
-clean-files := $(objtree)/kernel.spec
+        $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz
+        rm $(KERNELPATH).tar.gz kernel.spec
 
 # binrpm-pkg
 # ---------------------------------------------------------------------------
-$(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile
-        $(CONFIG_SHELL) $(MKSPEC) prebuilt > $@
-
-binrpm-pkg: $(objtree)/binkernel.spec FORCE
+binrpm-pkg: FORCE
         $(MAKE) KBUILD_SRC=
-        set -e; \
+        $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec
         $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
-        set -e; \
         mv -f $(objtree)/.tmp_version $(objtree)/.version
 
         $(RPM) $(RPMOPTS) --define "_builddir $(objtree)" --target \
                 $(UTS_MACHINE) -bb $<
-
-clean-files += $(objtree)/binkernel.spec
+        rm binkernel.spec
 
 # Deb target
 # ---------------------------------------------------------------------------