diff --git a/container/bin/build b/container/bin/build index 7f4525e..1c01aaa 100755 --- a/container/bin/build +++ b/container/bin/build @@ -5,7 +5,7 @@ set -exuo pipefail exec 3>&1 exec 1>&2 -pkg="$(build_source "$@")" - -build_indep "$pkg.dsc" -build_archdep "$pkg.dsc" +[ -d /output ] || sudo mkdir /output +build_source "$@" +build_indep /output +build_archdep /output diff --git a/container/bin/build_archdep b/container/bin/build_archdep index 72c4bc8..a5d02c9 100755 --- a/container/bin/build_archdep +++ b/container/bin/build_archdep @@ -6,10 +6,11 @@ exec 3>&1 exec 1>&2 main() ( - DEB_BUILD_OPTIONS="$(cat /input/.build_options)" + input_dir="${1:-/input}" + DEB_BUILD_OPTIONS="$(cat "$input_dir/.build_options")" export DEB_BUILD_OPTIONS - dsc="$(realpath "/input/.source")" + dsc="$(realpath "$input_dir/.source")" dpkg_arch="$(dpkg --print-architecture)" dsc_arch="$(grep -oP '(?<=^Architecture: ).*' < "$dsc" | tr ' ' '\n')" diff --git a/container/bin/build_indep b/container/bin/build_indep index 0362135..a918ecb 100755 --- a/container/bin/build_indep +++ b/container/bin/build_indep @@ -6,10 +6,11 @@ exec 3>&1 exec 1>&2 main() ( - DEB_BUILD_OPTIONS="$(cat /input/.build_options)" + input_dir="${1:-/input}" + DEB_BUILD_OPTIONS="$(cat "$input_dir/.build_options")" export DEB_BUILD_OPTIONS - dsc="$(realpath "/input/.source")" + dsc="$(realpath "$input_dir/.source")" dsc_arch="$(grep -oP '(?<=^Architecture: ).*' < "$dsc" | tr ' ' '\n')" grep -P '^(linux-)?all$' <<< "$dsc_arch" || exit 0