Skip to contentSkip to conversation

utils/br-reproduce-build: handle reproducibility failures

PATCH New Atharva Lele 2 participants 2 messages Aug 25, 2019 – Dec 26, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 utils/br-reproduce-build: handle reproducibility failures

Add a condition to check if the config has BR2_REPRODUCIBLE enabled and if it does, run the build in two output directories - output-1, output-2 - and then run diffoscope on the generated images.

NOTE: You should have diffoscope installed in order to test reproducibility failures.

---
 utils/br-reproduce-build | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)
utils/br-reproduce-build +21 -4
index 592edc2..d8df3b2 100755
@@ -76,7 +76,24 @@ if [ $? -ne 0 ] ; then
     exit 1
 fi
 
-mkdir ../output
-cp "${BUILD_DIR}/config" ../output/.config
-make olddefconfig O=../output/
-make 2>&1 O=../output | tee logfile
+# Handle cases of testing reproducibility failures.
+# Run the build in different output directories if BR2_REPRODUCIBLE=y
+# and run diffoscope on the generated images. Output of diffoscope is
+# saved in the "output-1" directory.
+# NOTE: You should have diffoscope installed in order to test
+# reproducibility failures.
+if grep -Fxq "BR2_REPRODUCIBLE=y" "${BUILD_DIR}/config"; then
+    mkdir ../output-1 ../output-2
+    cp "${BUILD_DIR}/config" ../output-1/.config
+    cp "${BUILD_DIR}/config" ../output-2/.config
+    make 2>&1 O=../output-1 | tee logfile && make 2>&1 O=../output-2 | tee logfile
+    PREFIX=$(make --no-print-directory O=../output-1 printvars VARS=TARGET_CROSS | cut -c 14- | head -c -1)
+    IMAGE_1="../output-1/images/rootfs.tar"
+    IMAGE_2="../output-2/images/rootfs.tar"
+    diffoscope ${IMAGE_1} ${IMAGE_2} --tool-prefix-binutils ${PREFIX} --text ../output-1/diffoscope_results.txt
+else
+    mkdir ../output
+    cp "${BUILD_DIR}/config" ../output/.config
+    make olddefconfig O=../output/
+    make 2>&1 O=../output | tee logfile
+fi
\ No newline at end of file
Signature · 1 line
2.22.0
#1 lore raw

PATCH 1/1 utils/br-reproduce-build: handle reproducibility failures

Hello,

Quoted 8 lines · On Sun, 25 Aug 2019 23:06:35 +0530 Atharva Lele <[email protected]> wrote:

Add a condition to check if the config has BR2_REPRODUCIBLE enabled and if it does, run the build in two output directories - output-1, output-2 - and then run diffoscope on the generated images.

NOTE: You should have diffoscope installed in order to test reproducibility failures.

Thanks, I've applied to buildroot-test after doing some changes. See below.

utils/br-reproduce-build if [ $? -ne 0 ] ; then · line 88

Quoted 10 lines
utils/br-reproduce-build +10 -0
+# Handle cases of testing reproducibility failures.
+# Run the build in different output directories if BR2_REPRODUCIBLE=y
+# and run diffoscope on the generated images. Output of diffoscope is
+# saved in the "output-1" directory.
+# NOTE: You should have diffoscope installed in order to test
+# reproducibility failures.
+if grep -Fxq "BR2_REPRODUCIBLE=y" "${BUILD_DIR}/config"; then
+    mkdir ../output-1 ../output-2
+    cp "${BUILD_DIR}/config" ../output-1/.config
+    cp "${BUILD_DIR}/config" ../output-2/.config

In the non-reproducible case, here we do an "olddefconfig" of the configuration, so I've done the same, in both the output-1 and output-2 directories.

Quoted 1 line

+ make 2>&1 O=../output-1 | tee logfile && make 2>&1 O=../output-2 | tee logfile

Here if the build fails we don't abort, we continue with the diffoscope call, which will fail since the rootfs.tar doesn't exist, so I've added a check for that.

Also, the "logfile" was overwriting itself: it is created in the buildroot/ source directory, so it is common to both builds. So I changed their name to logfile-1 and logfile-2.

utils/br-reproduce-build if [ $? -ne 0 ] ; then · line 99

Quoted 11 lines
utils/br-reproduce-build +10 -0
+    PREFIX=$(make --no-print-directory O=../output-1 printvars VARS=TARGET_CROSS | cut -c 14- | head -c -1)
+    IMAGE_1="../output-1/images/rootfs.tar"
+    IMAGE_2="../output-2/images/rootfs.tar"
+    diffoscope ${IMAGE_1} ${IMAGE_2} --tool-prefix-binutils ${PREFIX} --text ../output-1/diffoscope_results.txt
+else
+    mkdir ../output
+    cp "${BUILD_DIR}/config" ../output/.config
+    make olddefconfig O=../output/
+    make 2>&1 O=../output | tee logfile
+fi
\ No newline at end of file

And I added a newline character at the end of the file.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com