linux-kernel - Re: [PATCH 1/1] builddeb: Eliminate debian/arch use

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Sun, 19 Mar 2023 17:09:37 +0900
From:   Masahiro Yamada <masahiroy@...nel.org>
To:     Bastian Germann <bage@...utronix.de>
Cc:     Nathan Chancellor <nathan@...nel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>,
        linux-kbuild@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/1] builddeb: Eliminate debian/arch use

On Tue, Mar 14, 2023 at 9:43 AM Bastian Germann <bage@...utronix.de> wrote:
>
> In the builddeb context, the DEB_HOST_ARCH environment variable is set to
> the same value as debian/arch's content, so use the variable with
> dpkg-architecture.
>
> This is the last use of the debian/arch file during dpkg-buildpackage time.
>
> Signed-off-by: Bastian Germann <bage@...utronix.de>
> ---


Applied to linux-kbuild.
Thanks.

>  scripts/package/builddeb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index ff5e7d8e380b..ef43e8937f25 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -99,7 +99,7 @@ deploy_libc_headers () {
>
>         # move asm headers to /usr/include/<libc-machine>/asm to match the structure
>         # used by Debian-based distros (to support multi-arch)
> -       host_arch=$(dpkg-architecture -a$(cat debian/arch) -qDEB_HOST_MULTIARCH)
> +       host_arch=$(dpkg-architecture -a$DEB_HOST_ARCH -qDEB_HOST_MULTIARCH)
>         mkdir $pdir/usr/include/$host_arch
>         mv $pdir/usr/include/asm $pdir/usr/include/$host_arch/
>  }
> --
> 2.39.2
>


-- 
Best Regards
Masahiro Yamada