diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-02-11 19:44:04 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-02-11 19:58:50 -0500 |
| commit | b79ad7485be2457957898a6f87a8c8fe3de6cb96 (patch) | |
| tree | 435a5085be9f7e76e3d69bc7186c9e20cd69f890 | |
| parent | 55f681784a36e78f610264eab923e06064f47fe7 (diff) | |
| download | xfstests-bld-b79ad7485be2457957898a6f87a8c8fe3de6cb96.tar.gz | |
Display local changes to blktests from https://github.com/tytso/blktests
Also make sure the git trees are updated from build_config.sh before
generating the README in --readme-only mode.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | README.in | 3 | ||||
| -rwxr-xr-x | build-all-arches | 11 |
2 files changed, 9 insertions, 5 deletions
@@ -27,9 +27,10 @@ directory of the xfstests-bld git repository, plus Debian jessie's debootstrap, constitutes the scripts used to control the creation of these KVM images. -Local changes to xfstests can be found at: +Local changes to xfstests and blktests can be found at: https://github.com/tytso/xfstests @XFSTESTS_RELEASE@ + https://github.com/tytso/blktests @BLKTESTS_RELEASE@ The URL's for the other git repositories and scripts to download the sources from those repositories can be found in xfstests-bld's diff --git a/build-all-arches b/build-all-arches index 38b9bd48..b2df2e0c 100755 --- a/build-all-arches +++ b/build-all-arches @@ -13,7 +13,8 @@ function usage() function gen_README() { sed -e "s;@MIRROR@;$MIRROR;" \ - -e "s/@XFSTESTS_RELEASE@/$release/" \ + -e "s/@XFSTESTS_RELEASE@/$xfstests_rel/" \ + -e "s/@BLKTESTS_RELEASE@/$blktests_rel/" \ -e "/@VERFILE@/r git-versions" \ < README.in | sed -e '/^@VERFILE@$/d' > out_dir/README } @@ -38,17 +39,19 @@ done mkdir -p out_dir rm -f out_dir/README +sed -e '1,/^#BEGIN CONFIG.CUSTOM/d' < build_config.sh \ + >> $BUILD_DIR/config.custom +(cd $BUILD_DIR ; git pull ; ./get-all ) (cd $BUILD_DIR ; ./get-versions ) > git-versions -release=$(cd $BUILD_DIR/xfstests-dev ; git tag --points-at HEAD | grep ^release) +xfstests_rel=$(cd $BUILD_DIR/xfstests-dev ; git tag --points-at HEAD | grep ^release) +blktests_rel=$(cd $BUILD_DIR/blktests ; git tag --points-at HEAD | grep ^release) if test "$README_ONLY" = "yes" ; then gen_README exit 0 fi -(cd $BUILD_DIR ; git pull ; ./get-all ) - date for i in "${ARCH_LIST[@]}" ; do if test -n "$RESUME_ARCH" ; then |