summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-07-12 11:21:42 (GMT)
committerBoris Kolpackov <boris@codesynthesis.com>2018-07-12 11:21:42 (GMT)
commit5d8cc1f6c54bb758fb4d5378dec87b89e032e920 (patch)
treeec28b5d81cc4769424073b2b69e964b85881440d
parent6a4dae2285eecd9f94225beac179a179c5c68958 (diff)
Use new dist checksum generation support in stage script
-rwxr-xr-xstage20
1 files changed, 5 insertions, 15 deletions
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 () # <file>