Merge pull request #216 from infosiftr/reproducible-i386

Fix reproducibility of non-uclibc i386 builds

Author: yosifkit

Dockerfile-builder.template

@@ -15,6 +15,8 @@ RUN set -eux; \
 		tzdata \
 # busybox's tar ironically does not maintain mtime of directories correctly (which we need for SOURCE_DATE_EPOCH / reproducibility)
 		tar \
+# we use dpkg-architecture to pass a sane (userspace) "ARCH" to busybox's Makefile (see below)
+		dpkg-dev dpkg \
 	;
 {{ ) else ( -}}
 FROM debian:bookworm-slim
@@ -28,6 +30,8 @@ RUN set -eux; \
 		gnupg \
 		make \
 		patch \
+# we use dpkg-architecture to pass a sane (userspace) "ARCH" to busybox's Makefile (see below)
+		dpkg-dev \
 	; \
 	rm -rf /var/lib/apt/lists/*
 {{ ) end -}}
@@ -340,10 +344,15 @@ RUN set -eux; \
 
 RUN set -eux; \
 	nproc="$(nproc)"; \
+# https://git.busybox.net/busybox/tree/Makefile?h=1_37_stable#n145
 {{ if env.variant == "uclibc" then ( -}}
 	CROSS_COMPILE="$(basename /usr/src/buildroot/output/host/usr/*-buildroot-linux-uclibc*)"; \
 	export CROSS_COMPILE="$CROSS_COMPILE-"; \
-{{ ) else "" end -}}
+{{ ) else ( -}}
+# we need to override SUBARCH explicitly (via ARCH) to avoid "uname -m" which gives the wrong answer for builds like i386 on an amd64 machine because kernel architecture != userspace architecture
+	ARCH="$(dpkg-architecture --query DEB_HOST_ARCH_CPU)"; \
+	export ARCH; \
+{{ ) end -}}
 	make -j "$nproc" busybox; \
 	./busybox --help; \
 	mkdir -p rootfs/bin; \