| Message ID | 20230314004022.403937-2-bage@linutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | builddeb: Eliminate debian/arch use | expand |
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 >
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/ }
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(-)