diff options
author | Erich Eckner <git@eckner.net> | 2018-03-21 10:23:52 +0100 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-03-21 10:23:52 +0100 |
commit | 944da1b00e72f35fd758951a7b25bbb61f43b9fb (patch) | |
tree | a08cb66423f0375baecb9280bb1709e2b0dbf4dd /bin/get-package-updates | |
parent | 9d9efcad1de19425ea79988c9b8dd779999cd73c (diff) | |
download | builder-944da1b00e72f35fd758951a7b25bbb61f43b9fb.tar.xz |
bin/get-package-updates: work/build-order decomissioned
Diffstat (limited to 'bin/get-package-updates')
-rwxr-xr-x | bin/get-package-updates | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/bin/get-package-updates b/bin/get-package-updates index 69c5e9b..ce9d57a 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -506,42 +506,7 @@ if [ -n "${test_exclusion}" ]; then exit 0 fi -# Now we create the partial order. - -while read -r package git_revision mod_git_revision repository; do - # add "$pkgname -> $build-target" to build-order list - sed "s|^|${package} |" "${work_dir}/package-infos/${package}.${git_revision}.${mod_git_revision}.${repository}.builds" - # add "$dependency -> $pkgname" to build-order list - sed "s|\$| ${package}|" "${work_dir}/package-infos/${package}.${git_revision}.${mod_git_revision}.${repository}.build-depends" - # add "base/base-devel -> $pkgname" to build-order list - printf '%s '"${package}"'\n' 'base' 'base-devel' -done \ - < "${work_dir}/build-list.new" \ - > "${work_dir}/build-order" - -if grep -vq '^\S\+ \S\+$' "${work_dir}/build-order"; then - >&2 echo 'Created partial order file "build-order" is invalid.' - exit 2 -fi - -echo 'Now actually sort it.' - -{ - # this part will have the correct build order, but all the infos are missing - tsort "${work_dir}/build-order" | \ - nl -ba | \ - awk '{print $1 " not-git also-not-git whatever " $2}' - # this part has all the infos, but possibly the wrong order - awk '{print "0 " $2 " " $3 " " $4 " " $1}' "${work_dir}/build-list.new" -} | \ - sort -k5,5 -k1nr | \ - # now, we have the correct order and the infos, but in adjacent lines - uniq -f4 -D | \ - sed '/^0 /d;N;s|\n| |' | \ - # now in one line, each - sort -k1n,1 | \ - awk '{print $5 " " $7 " " $8 " " $9}' > \ - "${work_dir}/build-list.new.new" +echo 'Done - mark decisions as final.' # shellcheck disable=SC2016 { @@ -572,7 +537,7 @@ mysql_find_build_assignment_loops # Move the .new-files to the actual files { - printf '%s\n' "build-list.new" "build-list" "deletion-list" + printf '%s\n' "build-list" "deletion-list" # shellcheck disable=SC2086 printf '%s.revision\n' ${repo_names} } | \ |