diff options
| -rwxr-xr-x | projects/depthcharge/depthcharge | 2 | ||||
| -rwxr-xr-x | projects/depthcharge/depthcharge-helper | 20 | ||||
| -rw-r--r-- | projects/libpayload/configs/depthcharge/veyron/targets | 2 |
3 files changed, 21 insertions, 3 deletions
diff --git a/projects/depthcharge/depthcharge b/projects/depthcharge/depthcharge index 966b9689..dee1f555 100755 --- a/projects/depthcharge/depthcharge +++ b/projects/depthcharge/depthcharge @@ -69,7 +69,7 @@ build() { local sources_path=$(project_sources_path "$project" "$repository" "$@") local build_path=$(project_build_path "$project" "$@") - local libpayload_build_path=$(project_build_path "libpayload" "$project" "$@") + local libpayload_build_path=$(depthcharge_libpayload_build_path "$project" "$@") local libpayload_build_install_path="$libpayload_build_path/install" local vboot_sources_path=$(project_sources_path "vboot" "vboot" "devices") diff --git a/projects/depthcharge/depthcharge-helper b/projects/depthcharge/depthcharge-helper index 440fe0fe..d389fb97 100755 --- a/projects/depthcharge/depthcharge-helper +++ b/projects/depthcharge/depthcharge-helper @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr> +# Copyright (C) 2018 Andrew Robbins <contact@andrewrobbins.info> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,3 +25,22 @@ depthcharge_arch() { depthcharge_device() { arguments_concat "_" "$@" } + +depthcharge_libpayload_build_path() { + local project='libpayload' + local build_path="$root/$BUILD/$project" + + local argument + + for argument in "$@"; do + build_path="$build_path-$argument" + + if [[ -d $build_path ]]; then + break + else + continue + fi + done + + printf '%s\n' "$build_path" +} diff --git a/projects/libpayload/configs/depthcharge/veyron/targets b/projects/libpayload/configs/depthcharge/veyron/targets deleted file mode 100644 index 1722192f..00000000 --- a/projects/libpayload/configs/depthcharge/veyron/targets +++ /dev/null @@ -1,2 +0,0 @@ -minnie -speedy |