* [PATCH 0/1] builddeb: Eliminate debian/arch use
@ 2023-03-14 0:40 Bastian Germann
2023-03-14 0:40 ` [PATCH 1/1] " Bastian Germann
0 siblings, 1 reply; 3+ messages in thread
From: Bastian Germann @ 2023-03-14 0:40 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Bastian Germann, Nathan Chancellor, Nick Desaulniers,
linux-kbuild, linux-kernel
The debian/arch is almost unused.
Eliminate the last use during dpkg-buildpackage time.
Bastian Germann (1):
builddeb: Eliminate debian/arch use
scripts/package/builddeb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.39.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] builddeb: Eliminate debian/arch use
2023-03-14 0:40 [PATCH 0/1] builddeb: Eliminate debian/arch use Bastian Germann
@ 2023-03-14 0:40 ` Bastian Germann
2023-03-19 8:09 ` Masahiro Yamada
0 siblings, 1 reply; 3+ messages in thread
From: Bastian Germann @ 2023-03-14 0:40 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Bastian Germann, Nathan Chancellor, Nick Desaulniers,
linux-kbuild, linux-kernel
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@linutronix.de>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] builddeb: Eliminate debian/arch use
2023-03-14 0:40 ` [PATCH 1/1] " Bastian Germann
@ 2023-03-19 8:09 ` Masahiro Yamada
0 siblings, 0 replies; 3+ messages in thread
From: Masahiro Yamada @ 2023-03-19 8:09 UTC (permalink / raw)
To: Bastian Germann
Cc: Nathan Chancellor, Nick Desaulniers, linux-kbuild, linux-kernel
On Tue, Mar 14, 2023 at 9:43 AM Bastian Germann <bage@linutronix.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@linutronix.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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-19 8:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-14 0:40 [PATCH 0/1] builddeb: Eliminate debian/arch use Bastian Germann
2023-03-14 0:40 ` [PATCH 1/1] " Bastian Germann
2023-03-19 8:09 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox