From d225da1c4d3169be87246ee09bd3965bf3e49654 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 19 Jun 2017 15:07:14 +0200 Subject: reproducible Debian: replace stretch with buster, we dont care about stretch in the repo comparison anymore Signed-off-by: Holger Levsen --- TODO4buster.txt | 2 -- bin/reproducible_html_repository_comparison.sh | 32 +++++++++++++------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/TODO4buster.txt b/TODO4buster.txt index 3e57486c..439c53d3 100644 --- a/TODO4buster.txt +++ b/TODO4buster.txt @@ -4,6 +4,4 @@ special deployement needed for this: changes not yet prepared in git ------------------------------- -missing bits for the buster coming: - * _repository_comparison.sh finally, remove this file again. diff --git a/bin/reproducible_html_repository_comparison.sh b/bin/reproducible_html_repository_comparison.sh index 0c3e6b27..efe01b14 100755 --- a/bin/reproducible_html_repository_comparison.sh +++ b/bin/reproducible_html_repository_comparison.sh @@ -58,7 +58,7 @@ for PKG in $SOURCEPKGS ; do CRUFT="" BET="" OBSOLETE_IN_SID=false - OBSOLETE_IN_STRETCH=false + OBSOLETE_IN_BUSTER=false OBSOLETE_IN_EXP=false # # gather versions of a package @@ -77,23 +77,23 @@ for PKG in $SOURCEPKGS ; do CRUFT="$CRUFT ${VERSION}" fi done - STRETCH=$(rmadison -s stretch $PKG | egrep -v '^(debian|new):' | cut -d "|" -f2|xargs echo) + BUSTER=$(rmadison -s buster $PKG | egrep -v '^(debian|new):' | cut -d "|" -f2|xargs echo) EXPERIMENTAL=$(rmadison -s experimental $PKG | egrep -v '^(debian|new):' | cut -d "|" -f2|xargs echo) # # format output # CSID="" - CSTRETCH="" + CBUSTER="" CEXP="" - if [ ! -z "$STRETCH" ] ; then - for i in $STRETCH ; do + if [ ! -z "$BUSTER" ] ; then + for i in $BUSTER ; do if dpkg --compare-versions "$i" gt "$BET" ; then - CSTRETCH="$CSTRETCH$i
" - OBSOLETE_IN_STRETCH=true + CBUSTER="$CBUSTER$i
" + OBSOLETE_IN_BUSTER=true OBSOLETE_IN_SID=true OBSOLETE_IN_EXP=true else - CSTRETCH="$CSTRETCH$i
" + CBUSTER="$CBUSTER$i
" fi done fi @@ -179,8 +179,8 @@ for PKG in $SOURCEPKGS ; do else write_row "$GIT" MERGEINFO="" - if $OBSOLETE_IN_STRETCH ; then - MERGEINFO=" and available in stretch and unstable" + if $OBSOLETE_IN_BUSTER ; then + MERGEINFO=" and available in buster and unstable" elif $OBSOLETE_IN_SID ; then MERGEINFO=" and available in unstable" elif $OBSOLETE_IN_EXP ; then @@ -191,14 +191,14 @@ for PKG in $SOURCEPKGS ; do else write_row "$GIT" if [ "$PKG" != "strip-nondeterminism" ] && [ "$PKG" != "diffoscope" ] && [ "$PKG" != "debbindiff" ] && [ "$PKG" != "disorderfs" ] ; then - if $OBSOLETE_IN_STRETCH && $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then + if $OBSOLETE_IN_BUSTER && $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then write_row "
(unused?" write_row "
Then the branch should probably renamed.)" elif $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then - write_row "
(only used in stretch, fixed in sid," + write_row "
(only used in buster, fixed in sid," write_row "
branch probably either should be renamed to merged/reproducible_builds or a new upload to our repo is needed?)" elif $OBSOLETE_IN_EXP ; then - write_row "
(only used in stretch and unstable, fixed in experimental)" + write_row "
(only used in buster and unstable, fixed in experimental)" fi elif [ "$PKG" = "disorderfs" ] ; then write_row "
(only used to modify the build environment in the 2nd build)" @@ -221,7 +221,7 @@ for PKG in $SOURCEPKGS ; do write_row " bugs" write_row " $CRUFT" write_row " $BET $CBINARIES" - write_row " $CSTRETCH" + write_row " $CBUSTER" write_row " $CSID" write_row " $CEXP" write_row "" @@ -229,14 +229,14 @@ for PKG in $SOURCEPKGS ; do echo done if [ -s $TABLE_TODO ] ; then - write_page "

" + write_page "

packagegit repoPTS linkusertagged bug(s)old versions in our repo
(needed for reproducing old builds)		version in our repo
(available binary packages per architecture)		version in 'stretch'version in 'unstable'version in 'experimental'
" cat $TABLE_TODO >> $PAGE write_page "
packagegit repoPTS linkusertagged bug(s)old versions in our repo
(needed for reproducing old builds)		version in our repo
(available binary packages per architecture)		version in 'buster'version in 'unstable'version in 'experimental'

" else write_page "

Congratulations! There are no modified packages in our repository compared to unstable. (Yes, that means our repository is obsolete now.)" fi if [ -s $TABLE_DONE ] ; then - write_page "

" + write_page "

obsoleted package,
version in sid higher than in our repo		git repoPTS linkusertagged bug(s)old version(s) in our repo
(needed for reproducing old builds)		version in our repo
(available binary packages per architecture)		version in 'stretch'version in 'unstable'version in 'experimental'
" cat $TABLE_DONE >> $PAGE write_page "
obsoleted package,
version in sid higher than in our repo		git repoPTS linkusertagged bug(s)old version(s) in our repo
(needed for reproducing old builds)		version in our repo
(available binary packages per architecture)		version in 'buster'version in 'unstable'version in 'experimental'

" fi -- cgit v1.2.3-70-g09d2