From: Michal Marek <mmarek@suse.cz>
Date: Fri, 4 Jul 2014 20:53:52 +0000 (+0200)
Subject: kbuild: Fix packaging targets with relative $(srctree)
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c79624c1a698a82747b1e6fe54cc7effa4c07aa5;p=linux-beck.git

kbuild: Fix packaging targets with relative $(srctree)

All other users of Makefile.build set $(obj) to the name of the
subdirectory to build. Do the same for the packaging targets, otherwise
the build fails if $(srctree) is a relative directory:

    $ make O=build tar-pkg
    make[1]: Entering directory `/home/mmarek/linux-2.6/build'
      CHK     include/config/kernel.release
    ../scripts/Makefile.build:44: ../../scripts/package/Makefile: No such file or directory
    make[2]: *** No rule to make target `../../scripts/package/Makefile'.  Stop.

Fixes: 9da0763b ("kbuild: Use relative path when building in a subdir of the source tree")
Signed-off-by: Michal Marek <mmarek@suse.cz>
---

diff --git a/Makefile b/Makefile
index 1a5f9f3c7a58..347d6c7c7314 100644
--- a/Makefile
+++ b/Makefile
@@ -1176,7 +1176,7 @@ distclean: mrproper
 # Packaging of the kernel to various formats
 # ---------------------------------------------------------------------------
 # rpm target kept for backward compatibility
-package-dir	:= $(srctree)/scripts/package
+package-dir	:= scripts/package
 
 %src-pkg: FORCE
 	$(Q)$(MAKE) $(build)=$(package-dir) $@