From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Tue, 1 Dec 2020 08:55:46 +0000 (+0100)
Subject: treat-i386-as-x86
X-Git-Tag: archive/raspbian/0_R99-14469.B-2+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5a23d1e93fd1201c354ebe04e6f4f70bc3d3cbb2;p=vboot-utils.git

treat-i386-as-x86

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=974863

When building for i386 and running an amd64 kernel, the Makefile uses
"uname -m" to determine the architecture, but this introduces variations
depending on the kernel used to perform the build.

Gbp-Pq: Name treat-i386-as-x86.patch
---

diff --git a/Makefile b/Makefile
index c75c10f..8930eb0 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,9 @@ endif
 ifneq (,$(findstring i686,${_machname}))
 	override _machname := x86
 endif
+ifneq (,$(findstring i386,${_machname}))
+	override _machname := x86
+endif
 HOST_ARCH ?= ${_machname}
 
 # ARCH and/or FIRMWARE_ARCH are defined by the Chromium OS ebuild.