[Piuparts-devel] [Git][debian/piuparts][helmutg/fix-sync-diversion-for-bullseye] 3 commits: Disable build-path variation from salsa-ci reprotest

[Nicolas Dandrimont (@olasd)]

Nicolas Dandrimont pushed to branch helmutg/fix-sync-diversion-for-bullseye at Debian / piuparts


Commits:
1d74a8ab by Nicolas Dandrimont at 2024-05-04T14:31:15+02:00
Disable build-path variation from salsa-ci reprotest

Debian builds packages under a fixed build path, and go (which is used
for piuparts-debiman-distill) embeds the build path in binaries.

- - - - -
51e5b1a1 by Nicolas Dandrimont at 2024-05-04T12:50:41+00:00
Merge branch 'mr/reprotest-no-build_path' into 'develop'

Disable build-path variation from salsa-ci reprotest

See merge request debian/piuparts!58
- - - - -
3cfa9b97 by Helmut Grohne at 2024-05-04T13:11:36+00:00
also fix /bin/sync diversion for bullseye

When doing this in bookworm, we're in the unmerged case. Unfortunately,
I added --no-rename, so now ln -sv sees that /bin/sync exists and fails.

The --no-rename was added, because renaming is ambiguous on merged-/usr,
but we're in the unmerged case here, so use --rename.

Closes: #1068312
Fixes: 1b9a3843964b ("also fix /bin/sync diversion for bookworm")

- - - - -


2 changed files:

- .gitlab-ci/salsaci-overrides.yml
- custom-scripts/scripts/post_setup_force-unsafe-io


Changes:

=====================================
.gitlab-ci/salsaci-overrides.yml
=====================================
@@ -51,5 +51,7 @@ wrap-and-sort:
 
 variables:
   SALSA_CI_REPROTEST_ENABLE_DIFFOSCOPE: 1
+  # Go doesn't like build-path variation
+  SALSA_CI_REPROTEST_ARGS: --vary=-build_path
   # doesn't work for python arch-all packages
   SALSA_CI_DISABLE_CROSSBUILD_ARM64: 1


=====================================
custom-scripts/scripts/post_setup_force-unsafe-io
=====================================
@@ -26,9 +26,10 @@ then
 			mv /bin/sync /bin/sync.distrib.usr-is-merged
 		fi
 		dpkg-divert --add --no-rename --divert /usr/bin/sync.distrib /usr/bin/sync
-	# else
-	# 	We're probably unmerged-/usr and a single diversion will do.
+		dpkg-divert --add --no-rename --divert /bin/sync.distrib.usr-is-merged /bin/sync
+	else
+		# We're probably unmerged-/usr and a single diversion will do.
+		dpkg-divert --add --rename --divert /bin/sync.distrib /bin/sync
 	fi
-	dpkg-divert --add --no-rename --divert /bin/sync.distrib.usr-is-merged /bin/sync
 	ln -sv true /bin/sync
 fi



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/33f623d78f792da93ba3d38de444bbd083d28442...3cfa9b973a9721b06562c0d58d15f34ffcb31301

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/33f623d78f792da93ba3d38de444bbd083d28442...3cfa9b973a9721b06562c0d58d15f34ffcb31301
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20240504/816f1f59/attachment-0001.htm>