From 5d8cc1f6c54bb758fb4d5378dec87b89e032e920 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 12 Jul 2018 13:21:42 +0200 Subject: Use new dist checksum generation support in stage script --- stage | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'stage') diff --git a/stage b/stage index 131ed63..a1b77c6 100755 --- a/stage +++ b/stage @@ -144,23 +144,13 @@ if [ "$script_only" != true ]; then # rm -f "$owd/$dist_src/$v"/build2-toolchain-* - b "dist(build2-toolchain-default/)" \ - "config.dist.archives=$owd/$dist_src/$v/tar.xz $owd/$dist_src/$v/tar.gz" - - cd "$owd/$dist_src/$v/" - - tv="$(echo build2-toolchain-*.tar.gz | sed -re 's/build2-toolchain-(.+).tar.gz/\1/')" - - sha256sum -b "build2-toolchain-$tv.tar.gz" >"build2-toolchain-$tv.tar.gz.sha256" - sha256sum -b "build2-toolchain-$tv.tar.xz" >"build2-toolchain-$tv.tar.xz.sha256" - - cd "$owd" -else - cd "$owd/$dist_src/$v/" - tv="$(echo build2-toolchain-*.tar.gz | sed -re 's/build2-toolchain-(.+).tar.gz/\1/')" - cd "$owd" + b dist: build2-toolchain-default/ \ + "config.dist.archives=$owd/$dist_src/$v/tar.xz $owd/$dist_src/$v/tar.gz" \ + config.dist.checksums=sha256 fi +tv="$(echo "$owd/$dist_src/$v"/build2-toolchain-*.tar.gz | sed -re 's#.*/build2-toolchain-(.+).tar.gz#\1#')" + # Prepare the toolchain.sha256 checksums file. # function checksum_line () # -- cgit v1.1