kbuild: deb-pkg: move 'make headers' to build-arch

Strictly speaking, 'make headers' should be a part of build-arch
instead of binary-arch.

'make headers' constructs ready-to-copy UAPI headers in the kernel
directory.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index cc8c7a807fcc2d6c1b7392f043b194c944a8650f..842ee4b405285ea4c9812c0e954be722a8f90ced 100755 (executable)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -155,7 +155,6 @@ install_libc_headers () {
 
        rm -rf $pdir
 
-       $MAKE -f $srctree/Makefile headers
        $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=$pdir/usr
 
        # move asm headers to /usr/include/<libc-machine>/asm to match the structure

diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
index 7ab31419579f0480635f601bb560b58f72a4590f..09830778006227f5854580bba5099e21b09b8d1e 100755 (executable)
--- a/scripts/package/debian/rules
+++ b/scripts/package/debian/rules
@@ -26,8 +26,8 @@ binary-arch: build-arch
 build: build-arch build-indep
 build-indep:
 build-arch:
-       $(MAKE) $(make-opts) \
-       olddefconfig all
+       $(MAKE) $(make-opts) olddefconfig
+       $(MAKE) $(make-opts) $(if $(filter um,$(ARCH)),,headers) all
 
 .PHONY: clean
 clean: