]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
kbuild: builddeb: Eliminate debian/arch use
authorBastian Germann <bage@linutronix.de>
Tue, 14 Mar 2023 00:40:22 +0000 (01:40 +0100)
committerMasahiro Yamada <masahiroy@kernel.org>
Mon, 17 Apr 2023 02:03:56 +0000 (11:03 +0900)
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>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
scripts/package/builddeb

index 7b23f52c70c5fe33145bc4838dd52e95973b3a14..252faaa5561cc5e755a52c77761d7508f830cb2a 100755 (executable)
@@ -209,7 +209,7 @@ install_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/
 }