[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible FreeBSD: Drop outdated version number from documentation

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
a373d301 by Jessica Clarke at 2021-08-05T10:30:11+02:00
reproducible FreeBSD: Drop outdated version number from documentation

Due to its location, this version number will forever be forgotten about
and remain stale, as it is currently (the systems are on FreeBSD 13.0).
Better to just remove it and have people resort to reading the logs
(which contain the output of freebsd-version and thus will include this
information, but in even more detail, as that also includes the patch
level beyond just the release number) than to document this knowing it's
always going to end up outdated and misleading. We don't document the
Debian version on the equivalent pages for all the other equivalent
project pages, after all, just that it's a Debian environment.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
2d1468a2 by Jessica Clarke at 2021-08-05T10:32:02+02:00
reproducible FreeBSD: Actually ignore source tarball

The egrep argument was a glob, but egrep wants a(n extended) regex, so
this was not working correctly (GNU grep interprets this as matching
freebsd_main_git?.tar.xz, which is what's used in this case, whereas BSD
grep is more friendly and gives an error). But, in fact, the use of
egrep is redundant here, we can just get find to filter out the file in
the first place.

Note that because we're in the b1 directory, use find * and the file is
in the current directory we can use -regex despite it being for the
whole path and not the file name, as the two will be the same. Were this
to change, the regex would need appropriately prefixing to match a
directory prefix.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/reproducible_common.sh
- bin/reproducible_freebsd.sh


Changes:

=====================================
bin/reproducible_common.sh
=====================================
@@ -374,7 +374,7 @@ write_page_intro() {
 		write_page "        <p><em>Reproducible FreeBSD</em> is an effort to apply this to FreeBSD. Thus FreeBSD is build twice, with a few variations added and then the resulting filesystems from the two builds are put into a compressed tar archive, which is finally compared using <a href=\"https://tracker.debian.org/diffoscope\">diffoscope</a>. Please note that the toolchain is not varied at all as the rebuild happens on exactly the same system. More variations are expected to be seen in the wild.</p>"
 		local PROJECTNAME="freebsd"
 		local PROJECTURL="https://github.com/freebsd/freebsd-src.git"
-		local BUILD_ENVIRONMENT=", which via ssh triggers a build on a FreeBSD 11.2 system"
+		local BUILD_ENVIRONMENT=", which via ssh triggers a build on a FreeBSD system"
 		local BRANCH="main"
 	elif [ "$1" = "alpine" ] ; then
 		local PROJECTNAME="alpine"


=====================================
bin/reproducible_freebsd.sh
=====================================
@@ -63,7 +63,7 @@ run_diffoscope_on_results() {
 	cd $TMPDIR/b1
 	tree .
 	# maybe better remove that "freebsd_main_git?????????.tar.xz" from the tree first?
-	for j in $(find * -type l -prune -o -type f -print |sort -u | egrep -v "freebsd_main_git?????????.tar.xz" ) ; do
+	for j in $(find * -type l -prune -o -regex "freebsd_main_git.........\.tar\.xz" -prune -o -type f -print | sort -u) ; do
 		ALL_FILES[$FREEBSD_TARGET]=$(( ${ALL_FILES[$FREEBSD_TARGET]}+1 ))
 		call_diffoscope . $j
 		get_filesize $j



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/b00543b59cf559a5c07f1610ebc3bb57baee1629...2d1468a2abcdeae75f7077491b055cf98e375a9a

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/b00543b59cf559a5c07f1610ebc3bb57baee1629...2d1468a2abcdeae75f7077491b055cf98e375a9a
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/qa-jenkins-scm/attachments/20210805/d6a7d9bc/attachment-0001.htm>