aboutsummaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2018-11-22 18:00:33 -0500
committerAndrew Robbins <contact@andrewrobbins.info>2018-11-22 19:08:41 -0500
commit84c7f3d68de6f4e882c1c4a1666e6807cfd7a7e0 (patch)
treea0b262f862a1d23d76ed823b29716929fbd88305 /projects
parentf48397a0bc930b0edbc31709d45c037f0b8b34ec (diff)
downloadlibrebootfr-84c7f3d68de6f4e882c1c4a1666e6807cfd7a7e0.tar.gz
librebootfr-84c7f3d68de6f4e882c1c4a1666e6807cfd7a7e0.zip
Add function depthcharge_libpayload_build_path()
This function will return the correct build path for libpayload built for depthcharge targets nyan and veyron. Without this function, and using project_build_path() instead, LIBPAYLOAD_DIR would be set to "$root/$BUILD/libpayload-depthcharge-nyan-big" instead of the proper "$root/$BUILD/libpayload-depthcharge-nyan", for example.
Diffstat (limited to 'projects')
-rwxr-xr-xprojects/depthcharge/depthcharge2
-rwxr-xr-xprojects/depthcharge/depthcharge-helper20
2 files changed, 21 insertions, 1 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"
+}