From 76c10a9ded76d3d79b3dbc6ddafb31da2cf86a06 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 12 Dec 2015 15:34:47 +0100 Subject: reproducible fedora/rpms: cleanup stub webpage --- bin/reproducible_common.sh | 17 +++++++++++++---- bin/reproducible_html_rpms.sh | 11 +++++------ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index d4953bc2..8193fda8 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -311,14 +311,17 @@ write_page_intro() { local BUILD_ENVIRONMENT=", which via ssh triggers a build on a FreeBSD 10.2 system" local BRANCH="release/10.2.0" 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="Arch Linux" + write_page " Reproducible $PROJECTNAME is an effort to apply this to $PROJECTNAME. Thus $PROJECTNAME 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.

" + elif [ "$1" = "fedora-23" ] ; then + local PROJECTNAME="Fedora 23" + write_page " Reproducible $PROJECTNAME is an effort to apply this to $PROJECTNAME. Thus $PROJECTNAME 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.

" fi - if [ "$1" != "Arch Linux" ] ; then + if [ "$1" != "Arch Linux" ] && [ "$1" != "fedora-23" ] ; then write_page "

There is a weekly run jenkins job to test the $BRANCH branch of $PROJECTNAME.git. 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." write_page "
Thanks to Profitbricks for donating the virtual machines this is running on!

" else - write_page "

FIXME: explain Arch Linux test setup here.

" + write_page "

FIXME: explain $PROJECTNAME test setup here.

" fi } @@ -332,6 +335,8 @@ write_page_footer() { 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" = "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." + elif [ "$1" = "fedora-23" ] ; then + write_page "FIXME: add fedora copyright+trademark disclaimers here." fi write_page "

" } @@ -343,6 +348,10 @@ write_page_meta_sign() { write_explaination_table() { write_page "

" + if [ "$1" = "fedora-23" ] ; then + write_page "There are no variations introduced in the $1 builds yet. Stay tuned.

" + return + fi write_page "" if [ "$1" = "debian" ] ; then write_page "" @@ -351,7 +360,7 @@ write_explaination_table() { write_page "" write_page "" fi - if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ] ; then + if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ] && [ "$1" != "fedora-23" ] ; then write_page "" fi write_page "" diff --git a/bin/reproducible_html_rpms.sh b/bin/reproducible_html_rpms.sh index 3d9d7706..efa3e0e4 100755 --- a/bin/reproducible_html_rpms.sh +++ b/bin/reproducible_html_rpms.sh @@ -44,7 +44,6 @@ for PKG in $(find $RPMBASE/$RELEASE/$ARCH/* -maxdepth 1 -type d -exec basename { fi let TESTED+=1 echo " " >> $HTML_BUFFER - echo " " >> $HTML_BUFFER echo " " >> $HTML_BUFFER echo " " >> $HTML_RPM_STATS # DATE=$(date -u +'%Y-%m-%d') cd $RPMBASE -PAGE=rpms/$RELEASE.html +PAGE=$RELEASE.html echo "$(date -u) - starting to build $PAGE" cat > $PAGE <<- EOF @@ -129,18 +128,18 @@ cat > $PAGE <<- EOF
EOF -write_page_intro '$RELEASE' -write_explaination_table '$RELEASE' +write_page_intro "$RELEASE" +write_explaination_table "$RELEASE" write_page "
variationfirst buildsecond build
hostnameone of: $(for i in $BUILD_NODES ; do echo '
  ' ; echo $i | cut -d '.' -f1 ; done)		i-capture-the-hostname
hostname is not yet varied between rebuilds of $1.
domainname is not yet varied between rebuilds of $1.
env CAPTURE_ENVIRONMENTnot setCAPTURE_ENVIRONMENT=\"I capture the environment\"
env TZTZ=\"/usr/share/zoneinfo/Etc/GMT+12\"TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"
$RELEASE ($ARCH)$PKG" >> $HTML_BUFFER if [ -z "$(cd $RPMBASE/$RELEASE/$ARCH/$PKG/ ; ls *.rpm.html 2>/dev/null)" ] ; then @@ -110,7 +109,7 @@ echo "
" cat $HTML_RPM_STATS >> $PAGE rm $HTML_RPM_STATS > /dev/null write_page "
release (architecture)all sources packagesreproducible packagesunreproducible packagespackages failing to buildpackages in depwait statepackages 404unknown state
" -write_page " " +write_page "
release (architecture)source packagetest resulttest date1st build log2nd build log
" for i in $HTML_UNKNOWN $HTML_FTBFS $HTML_DEPWAIT $HTML_404 $HTML_FTBR $HTML_GOOD ; do cat $i >> $PAGE rm $i > /dev/null done write_page "
source packagetest resulttest date1st build log2nd build log
" write_page "" -write_page_footer '$RELEASE' +write_page_footer "$RELEASE" echo "$(date -u) - enjoy $REPRODUCIBLE_URL/rpms/$PAGE" -- cgit v1.2.3-54-g00ecf