Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <4a55805c694cff4cc9281961f2d457262bea48e6.1679423785.git.kevin@kevinlocke.name>
 <3351f907cfd0b5d8372e858a8ec9065cc2bd91df.1679434718.git.kevin@kevinlocke.name>
In-Reply-To: <3351f907cfd0b5d8372e858a8ec9065cc2bd91df.1679434718.git.kevin@kevinlocke.name>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Wed, 22 Mar 2023 23:21:20 +0900
Message-ID: <CAK7LNAQNkmf+etNU7HnAb8ktmKAVzG+-+HUCQNeoX3c8tRuMYA@mail.gmail.com>
Subject: Re: [PATCH v2] kbuild: deb-pkg: set version for linux-headers paths
To:     Kevin Locke <kevin@kevinlocke.name>
Cc:     linux-kbuild@vger.kernel.org,
        Linus Torvalds <torvalds@linux-foundation.org>,
        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
Precedence: bulk

On Wed, Mar 22, 2023 at 6:39=E2=80=AFAM Kevin Locke <kevin@kevinlocke.name>=
 wrote:
>
> As a result of the switch to dh_listpackages, $version is no longer set
> when install_kernel_headers() is called.  This causes files in the
> linux-headers deb package to be installed to a path with an empty
> $version (e.g. /usr/src/linux-headers-/scripts/sign-file rather than
> /usr/src/linux-headers-6.3.0-rc3/scripts/sign-file).
>
> To avoid this, while continuing to use the version information from
> dh_listpackages, pass $version from $package as the second argument
> of install_kernel_headers().
>
> Fixes: 36862e14e316 ("kbuild: deb-pkg: use dh_listpackages to know enable=
d packages")
> Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
> ---

Applied to linux-kbuild/fixes. Thanks.


> Good idea!  Thanks for the quick review and feedback.  Here's an updated
> version.
>
> Changes since v1:
>  * Pass version as the second argument to install_kernel_headers(),
>    rather than as a global variable, as suggested by Masahiro Yamada.
>
>  scripts/package/builddeb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index c5ae57167d7c..7b23f52c70c5 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -162,6 +162,7 @@ install_linux_image_dbg () {
>
>  install_kernel_headers () {
>         pdir=3D$1
> +       version=3D$2
>
>         rm -rf $pdir
>
> @@ -229,7 +230,7 @@ do
>         linux-libc-dev)
>                 install_libc_headers debian/linux-libc-dev;;
>         linux-headers-*)
> -               install_kernel_headers debian/linux-headers;;
> +               install_kernel_headers debian/linux-headers ${package#lin=
ux-headers-};;
>         esac
>  done
>
> --
> 2.39.2
>


--=20
Best Regards
Masahiro Yamada