From 3bfe6d5f28e8edff763682659567cabc21382ff3 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 19 Oct 2015 08:41:21 +0200 Subject: reproducible Arch Linux: correctly spell project name --- bin/reproducible_common.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'bin/reproducible_common.sh') diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 84ff0e83..606c85b4 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -199,7 +199,7 @@ write_page_header() { write_page " or send us an email," write_page " to get support for making sure your packages build reproducibly too. Also, we care about free software in general," write_page " so if you are an upstream developer or working on another distribution, we'd love to hear from you!" - write_page " Besides Debian we are also testing
  • coreboot
  • ,
  • OpenWrt
  • ,
  • NetBSD
  • ,
  • FreeBSD
  • and
  • Archlinux
  • now, though not as thoroughly as Debian (yet?) - and there are plans to test Fedora too." + write_page " Besides Debian we are also testing
  • coreboot
  • ,
  • OpenWrt
  • ,
  • NetBSD
  • ,
  • FreeBSD
  • and
  • Arch Linux
  • now, though not as thoroughly as Debian (yet?) - and there are plans to test Fedora too." write_page " " fi @@ -288,11 +288,11 @@ write_page_intro() { local PROJECTURL="https://github.com/freebsd/freebsd.git" local BUILD_ENVIRONMENT=", which via ssh triggers a build on a FreeBSD 10.1 system" local BRANCH="release/10.2.0" - elif [ "$1" = "Archlinux" ] ; then + elif [ "$1" = "Arch Linux" ] ; then write_page " Reproducible $1 is an effort to apply this to $1. Thus $1 packages are build twice, with a few varitations added and then the resulting packages from the two builds are then compared using diffoscope. 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.

    " - local PROJECTNAME="Archlinux" + local PROJECTNAME="Arch Linux" fi - if [ "$1" != "Archlinux" ] ; then + if [ "$1" != "Arch Linux" ] ; then write_page "

    There is a weekly run jenkins job to test the $BRANCH branch of $PROJECTNAME.git. Currently this job is triggered more often though, because this is still under development and brand new. The jenkins job is running reproducible_$PROJECTNAME.sh$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join #debian-reproducible (on irc.oftc.net) to request job runs whenever sensible. Patches and other feedback are very much appreciated - if you want to help, please start by looking at the ToDo list for $1, you might find something easy to contribute.

    " else write_page "

    This is brand new and the test setup needs to be explained here.

    " @@ -307,7 +307,7 @@ write_page_footer() { write_page "NetBSD® is a registered trademark of The NetBSD Foundation, Inc." elif [ "$1" = "FreeBSD" ] ; then write_page "FreeBSD is a registered trademark of The FreeBSD Foundation. The FreeBSD logo and The Power to Serve are trademarks of The FreeBSD Foundation." - elif [ "$1" = "Archlinux" ] ; then + elif [ "$1" = "Arch Linux" ] ; then write_page "The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis." fi write_page "

    " @@ -328,17 +328,17 @@ write_explaination_table() { write_page "hostname is not yet varied between rebuilds of $1." write_page "domainname is not yet varied between rebuilds of $1." fi - if [ "$1" != "FreeBSD" ] && [ "$1" != "Archlinux" ] ; then + if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ] ; then write_page "env CAPTURE_ENVIRONMENTnot setCAPTURE_ENVIRONMENT=\"I capture the environment\"" fi write_page "env TZTZ=\"/usr/share/zoneinfo/Etc/GMT+12\"TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"" - if [ "$1" = "Archlinux" ] ; then + if [ "$1" = "Arch Linux" ] ; then write_page "env LANGLANGnot setLANG=\"fr_CH.UTF-8\"" else write_page "env LANGLANG=\"en_GB.UTF-8\"LANG=\"fr_CH.UTF-8\"" fi write_page "env LC_ALLnot setLC_ALL=\"fr_CH.UTF-8\"" - if [ "$1" != "FreeBSD" ] && [ "$1" != "Archlinux" ] ; then + if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ] ; then write_page "env PATHPATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:\"PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path\"" else write_page "env PATH is not yet varied between rebuilds of $1." @@ -362,7 +362,7 @@ write_explaination_table() { if [ "$1" != "FreeBSD" ] ; then if [ "$1" = "debian" ] ; then write_page "kernel version, modified using /usr/bin/linux64 --uname-2.6one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '
      ')one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL2 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '
      ')" - elif [ "$1" != "Archlinux" ] ; then + elif [ "$1" != "Arch Linux" ] ; then write_page "kernel version, modified using /usr/bin/linux64 --uname-2.6$(uname -sr)$(/usr/bin/linux64 --uname-2.6 uname -sr)" else write_page "kernel version is not yet varied between rebuilds of $1." -- cgit v1.2.3-70-g09d2