Source: atf
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: usrmerge
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

The path to bash is embedded differently in various binaries depending
on weather it is built in a usrmerge or non-usrmerge environment:

  
https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/atf.html

  /usr/bin/atf-sh

  /bin/bash
  vs.
  /usr/bin/bash

The attached patch fixes this by passing ATF_SHELL to dh_auto_build in
debian/rules.

According to my local tests, with this patch applied atf should build
reproducibly on tests.reproducible-builds.org when it migrates to
trixie/testing! Unfortunately, there are still unresolved build path
issues which are tested on unstable and experimental.

Thanks for maintaining atf!

live well,
  vagrant
From bc4307d7b3dd7a1e9a6606dee1975525b37aaa59 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Wed, 28 Jun 2023 14:04:56 -0700
Subject: [PATCH] debian/rules: Pass ATF_SHELL to dh_auto_build.

Otherwise, the path to bash is embedded differently in a usrmerge and
non-usrmerge environment. Use /bin/bash, as that is present in both cases.

https://tests.reproducible-builds.org/debian/issues/unstable/paths_vary_due_to_usrmerge_issue.html
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index 33c3a6c..2176966 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@
 
+override_dh_auto_build:
+	dh_auto_build -- ATF_SHELL=/bin/bash
+
 override_dh_auto_test:
 	-dh_auto_test -- installcheck-kyua
-- 
2.39.2

Attachment: signature.asc
Description: PGP signature

Reply via email to