=== modified file 'common.zsh' --- common.zsh 2017-11-14 23:44:48 +0000 +++ common.zsh 2017-11-14 19:45:25 +0000 @@ -119,7 +119,7 @@ run=( redo-ifchange ) fi target=${(j::)${(oq)a}}$.name - "$run[@]" meta/$target || die "Building $name failed ($target)" + "$run[@]" meta/$target if (($#lift)); then # lift %variables from calee to caller === modified file 'default.alpine-base.do' --- default.alpine-base.do 2017-11-14 23:44:48 +0000 +++ default.alpine-base.do 2017-11-14 19:45:25 +0000 @@ -3,33 +3,7 @@ checkvars arch defvar release edge defvar repositories main - defvar alpine_mirror http://dl-3.alpinelinux.org/alpine - - local repo - local -a apk_args - apk_args=( ) - - fresh-build-dir - - mkdir -p $vars[build_dir]/etc/apk || die "failed to set up apk" - - for repo in $=vars[repositories]; do - # Fetch APKINDEX files to see if they changed - depend download-file %filename url=$vars[alpine_mirror]/$vars[release]/$repo/$vars[arch]/APKINDEX.tar.gz -- redo-always - redo-ifchange $vars[filename] - unset vars[filename] - print -rl - $vars[alpine_mirror]/$vars[release]/$repo >> ${build_dir}/etc/apk/repositories || die "failed to set up apk" - done - - apk_args+=( - --update-cache - --root $vars[build_dir] - --arch $arch - --keys-dir /etc/apk/keys/ - --initdb - add alpine-base - ) - apk.static $apk_args || die "alpine init failed" + } . ./common.zsh # vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4 === removed directory 'functions' === removed file 'functions/fresh-build-dir' --- functions/fresh-build-dir 2017-11-14 23:44:48 +0000 +++ functions/fresh-build-dir 1970-01-01 00:00:00 +0000 @@ -1,10 +0,0 @@ -if ! (($+vars[build_dir])); then - vars[build_dir]=$DO:h/work/$BASE -fi -if [[ -e $vars[build_dir] ]]; then - rm -rf $vars[build_dir] \ - || die "Failed to clean build directory ${(qqq)vars[build_dir]}" -fi -mkdir -p $vars[build_dir] \ - || die "Failed to create build directory ${(qqq)vars[build_dir]}" -# vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4