kbuild: builddeb: Eliminate debian/arch use

Bastian Germann · masahir0y · commit 491b146d4c13 · 2023-04-17T11:03:56.000+09:00
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 &lt;bage@linutronix.de&gt;
Signed-off-by: Masahiro Yamada &lt;masahiroy@kernel.org&gt;
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
@@ -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/
 }

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ install_libc_headers () {`
`209`	`209`
`210`	`210`	`# move asm headers to /usr/include/<libc-machine>/asm to match the structure`
`211`	`211`	`# used by Debian-based distros (to support multi-arch)`
`212`		`- host_arch=$(dpkg-architecture -a$(cat debian/arch) -qDEB_HOST_MULTIARCH)`
	`212`	`+ host_arch=$(dpkg-architecture -a$DEB_HOST_ARCH -qDEB_HOST_MULTIARCH)`
`213`	`213`	`mkdir $pdir/usr/include/$host_arch`
`214`	`214`	`mv $pdir/usr/include/asm $pdir/usr/include/$host_arch/`
`215`	`215`	`}`