Received-SPF: pass (google.com: domain of linux-kernel+bounces-20378-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <20231230135200.1058873-1-masahiroy@kernel.org>
In-Reply-To: <20231230135200.1058873-1-masahiroy@kernel.org>
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Tue, 9 Jan 2024 13:38:07 +0900
Message-ID: <CAK7LNATLZ2rt8fFZYu1KX4HW5s0EjNbDEXp8csCPGtA5a-6qPw@mail.gmail.com>
Subject: Re: [PATCH 1/5] kbuild: deb-pkg: move 'make headers' to build-arch
To: linux-kbuild@vger.kernel.org
Cc: Ben Hutchings <ben@decadent.org.uk>, Nathan Chancellor <nathan@kernel.org>, 
	Nick Desaulniers <ndesaulniers@google.com>, Nicolas Schier <nicolas@fjasle.eu>, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sat, Dec 30, 2023 at 10:52=E2=80=AFPM Masahiro Yamada <masahiroy@kernel.=
org> wrote:
>
> Strictly speaking, 'make headers' should be a part of build-arch
> instead of binary-arch.
>
> 'make headers' constructs read-to-copy UAPI headers in the kernel
> directory.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
>  scripts/package/builddeb     | 1 -
>  scripts/package/debian/rules | 4 ++--
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index cc8c7a807fcc..842ee4b40528 100755
> --- 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=3D$pd=
ir/usr
>
>         # move asm headers to /usr/include/<libc-machine>/asm to match th=
e structure
> diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
> index cb084e387469..a686c37d0d02 100755
> --- 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) headers all


To avoid a build error for ARCH=3Dum,
I will apply the following fix-up.


diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
index 1a18ca3c43db..098307780062 100755
--- a/scripts/package/debian/rules
+++ b/scripts/package/debian/rules
@@ -27,7 +27,7 @@ build: build-arch build-indep
 build-indep:
 build-arch:
        $(MAKE) $(make-opts) olddefconfig
-       $(MAKE) $(make-opts) headers all
+       $(MAKE) $(make-opts) $(if $(filter um,$(ARCH)),,headers) all

 .PHONY: clean
 clean:


>
>  .PHONY: clean
>  clean:
> --
> 2.40.1
>


--=20
Best Regards
Masahiro Yamada