kbuild/rpm: Fix 'make rpm' and enable use of 'make O=dir rpm'

Simplify 'make rpm' a bit, and enable use of rpm in combination with separate
output directory.
Also added kernel.spec to ignore list

diff --git a/Makefile b/Makefile
index 3fbc794d318f470f4e0ecf528d9aaa804dc1e7b6..3fbdc69ba1aefc28f243a975971d8c56fcb86f88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -82,12 +82,13 @@ endif
 ifneq ($(KBUILD_OUTPUT),)
 # Invoke a second make in the output directory, passing relevant variables
        KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT); /bin/pwd)
-%:
-       @$(MAKE) -C $(KBUILD_OUTPUT)            \
-       KBUILD_SRC=$(CURDIR)                    \
-       KBUILD_VERBOSE=$(KBUILD_VERBOSE)        \
-       KBUILD_CHECK=$(KBUILD_CHECK)            \
-       -f $(CURDIR)/Makefile $(MAKECMDGOALS)
+
+.PHONY: $(MAKECMDGOALS) all
+
+$(MAKECMDGOALS) all:
+       $(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT)         \
+       KBUILD_SRC=$(CURDIR)    KBUILD_VERBOSE=$(KBUILD_VERBOSE)        \
+       KBUILD_CHECK=$(KBUILD_CHECK) -f $(CURDIR)/Makefile $(MAKECMDGOALS)
 
 # Leave processing to above invocation of make
 skip-makefile := 1
@@ -97,7 +98,7 @@ endif # ifeq ($(KBUILD_SRC),)
 # We process the rest of the Makefile if this is the final invocation of make
 ifeq ($(skip-makefile),)
 
-srctree                := $(if $(KBUILD_SRC),$(KBUILD_SRC),.)
+srctree                := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
 TOPDIR         := $(srctree)
 # FIXME - TOPDIR is obsolete, use srctree/objtree
 objtree                := $(CURDIR)
@@ -120,9 +121,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
                                  -e s/arm.*/arm/ -e s/sa110/arm/ \
                                  -e s/s390x/s390/ -e s/parisc64/parisc/ )
 
-# Remove hyphens since they have special meaning in RPM filenames
-KERNELPATH=kernel-$(subst -,,$(KERNELRELEASE))
-
 # Cross compiling and selecting different set of gcc/bin-utils
 # ---------------------------------------------------------------------------
 #
@@ -835,31 +833,32 @@ tags: FORCE
 
 .PHONY: rpm
 
+# Remove hyphens since they have special meaning in RPM filenames
+KERNELPATH=kernel-$(subst -,,$(KERNELRELEASE))
+
 #      If you do a make spec before packing the tarball you can rpm -ta it
 
 spec:
-       . $(srctree)/scripts/mkspec >kernel.spec
+       $(CONFIG_SHELL) $(srctree)/scripts/mkspec > $(objtree)/kernel.spec
 
-#      Build a tar ball, generate an rpm from it and pack the result
-#      There are two bits of magic here
-#      1) The use of /. to avoid tar packing just the symlink
-#      2) Removing the .dep files as they have source paths in them that
-#         will become invalid
+#      a) Build a tar ball
+#      b) generate an rpm from it
+#      c) and pack the result
+#      - Use /. to avoid tar packing just the symlink
 
 rpm:   clean spec
-       find . $(RCS_FIND_IGNORE) \
-               \( -size 0 -o -name .depend -o -name .hdepend \) \
-               -type f -print | xargs rm -f
        set -e; \
-       cd $(TOPDIR)/.. ; \
-       ln -sf $(TOPDIR) $(KERNELPATH) ; \
+       cd .. ; \
+       ln -sf $(srctree) $(KERNELPATH) ; \
        tar -cvz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \
-       rm $(KERNELPATH) ; \
-       cd $(TOPDIR) ; \
-       $(CONFIG_SHELL) $(srctree)/scripts/mkversion > .tmp_version ; \
-       mv -f .tmp_version .version; \
-       $(RPM) -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
-       rm $(TOPDIR)/../$(KERNELPATH).tar.gz
+       rm $(KERNELPATH)
+
+       set -e; \
+       $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version;\
+       mv -f $(objtree)/.tmp_version $(objtree)/.version;
+
+       $(RPM) -ta ../$(KERNELPATH).tar.gz
+       rm ../$(KERNELPATH).tar.gz
 
 # Brief documentation of the typical targets used
 # ---------------------------------------------------------------------------

diff --git a/scripts/mkspec b/scripts/mkspec
index c8795d20fde910304be64cad0c0164381ad90d7e..841512debca535aa5e2ea449e001f460a22b47ab 100755 (executable)
--- a/scripts/mkspec
+++ b/scripts/mkspec
@@ -27,7 +27,7 @@ echo "Summary: The Linux Kernel"
 echo "Version: "$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION | sed -e "s/-//g"
 # we need to determine the NEXT version number so that uname and
 # rpm -q will agree
-echo "Release: `. scripts/mkversion`"
+echo "Release: `. $srctree/scripts/mkversion`"
 echo "License: GPL"
 echo "Group: System Environment/Kernel"
 echo "Vendor: The Linux Community"
@@ -45,7 +45,7 @@ echo "%prep"
 echo "%setup -q"
 echo ""
 echo "%build"
-echo "make clean oldconfig all"
+echo "make clean all"
 echo ""
 echo "%install"
 echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'