diff options
| -rwxr-xr-x | bin/build-packages | 24 | ||||
| -rwxr-xr-x | bin/common-functions | 11 | ||||
| -rwxr-xr-x | bin/db-update | 2 | ||||
| -rwxr-xr-x | bin/get-assignment | 2 | ||||
| -rwxr-xr-x | bin/get-package-updates | 6 | ||||
| -rwxr-xr-x | bin/return-assignment | 1 |
6 files changed, 38 insertions, 8 deletions
diff --git a/bin/build-packages b/bin/build-packages index 410ee16..5420f56 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -5,11 +5,27 @@ # https://github.com/archlinux32/builder/wiki/Build-system#build-packages # TODOs: -# use different build commands for different repositories - do we need this actually? + +# use different build commands for different repositories - do we need +# this actually? + # send logs of failed builds -# handle if build fails due to "local issues" (e.g. unclean build environment, wrong mirror, ...) -# force different cache for builds (since we don't want to build against an empty i686 cache on a x86_64 host) -# remove explicit installation of archlinux32-keyring inside the build environment - this should be possible after the next pacman upgrade + +# handle if build fails due to "local issues" (e.g. unclean +# build environment, wrong mirror, ...) + +# force different cache for builds (since we don't want to build +# against an empty i686 cache on a x86_64 host) + +# remove explicit installation of archlinux32-keyring inside the build +# environment - this should be possible after the next pacman upgrade + +# avoid any-packages from x86_64 mirrors in /var/cache/pacman/pkg of +# build slave + +# maybe use 'git archive' instead of 'git checkout' to get current +# port -- this way we could run more than one build job per repo, +# and we could get rid of the 'git clean', ... mess . "${0%/*}/../conf/default.conf" diff --git a/bin/common-functions b/bin/common-functions index 2eeca5e..911a580 100755 --- a/bin/common-functions +++ b/bin/common-functions @@ -3,7 +3,11 @@ # contains functions used by more than one script # TODO: -# maybe source PKGBUILD instead of 'makepkg --printsrcinfo' and 'mksrcinfo'? + +# maybe source PKGBUILD instead of 'makepkg --printsrcinfo' and +# 'mksrcinfo'? + +# mangle $arch in PKBUILDs to contain i486, i586, i686 # find_pkgbuild repository package # find the PKGBUILD of $package from $repository @@ -53,9 +57,6 @@ find_pkgbuild() { # apply customizations to a package # (to be executed in the package's directory) -# TODO: -# mangle $arch in PKBUILDs to contain i486, i586, i686 - apply_package_customizations() { if [ ! -f 'PKGBUILD' ]; then >&2 echo 'PKGBUILD not found.' @@ -315,6 +316,7 @@ remove_old_package_versions() { # wait_some_time $minimum $diff # wait between minimum and minimum+diff seconds (diff defaults to 30) + wait_some_time() { local minimum=$1 local diff=$2 @@ -335,6 +337,7 @@ wait_some_time() { # str_to_regex $string # escape dots for use in regex + str_to_regex() { echo "$1" | \ sed 's|\.|\\.|g' diff --git a/bin/db-update b/bin/db-update index 9b7b3d0..2d161ed 100755 --- a/bin/db-update +++ b/bin/db-update @@ -9,8 +9,10 @@ # b) no done package B which is not being moved depends on A # TODO: + # the meta data used to evaluate condition "b" might be for a different # version + # correctly handle if multiple versions of a single package are marked # as "done" diff --git a/bin/get-assignment b/bin/get-assignment index 8adcdbf..73aeb1d 100755 --- a/bin/get-assignment +++ b/bin/get-assignment @@ -14,7 +14,9 @@ # maximum allowed parallel jobs per ip # TODO: + # respect build-manually-list ("blocked") + # possibly hand out "broken" packages to different build slave . "${0%/*}/../conf/default.conf" diff --git a/bin/get-package-updates b/bin/get-package-updates index b78187e..35afbe1 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -5,10 +5,16 @@ # https://github.com/archlinux32/builder/wiki/Build-system#get-package-updates # TODOs: + # be more secure in case of update while build(s) is/are still in progress # -> (stale) lock files, moving (or changing content of) loop lock files + +# (might be connected to above): find out who deletes loop-files which +# should not be deleted + # dependencies declared inside a PKGBUILD's package function do not # correctly take into account CARCH (see package "gens" from community) + # remove extra case for "python-pysocks" and "gens" . "${0%/*}/../conf/default.conf" diff --git a/bin/return-assignment b/bin/return-assignment index 00d4cd4..78d888a 100755 --- a/bin/return-assignment +++ b/bin/return-assignment @@ -15,6 +15,7 @@ # 4: package error (e.g. wrong packages sent) # TODO: + # fix signing of database . "${0%/*}/../conf/default.conf" |