From 4a0331e0862782c78f7372c91e9e3d5d2a856906 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 2 Oct 2017 21:39:52 -0400 Subject: Build only depthcharge in depthcharge build action Makes things easier to maintain if a project only builds itself--less moving parts, etc. --- projects/depthcharge/depthcharge | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/depthcharge/depthcharge b/projects/depthcharge/depthcharge index ca31d4be..f7645092 100755 --- a/projects/depthcharge/depthcharge +++ b/projects/depthcharge/depthcharge @@ -76,9 +76,6 @@ build() { local arch=$( depthcharge_arch "$@" ) local device=$( depthcharge_device "$@" ) - project_action "build" "crossgcc" "$arch" - project_action "build" "libpayload" "$project" "$@" - project_action "checkout" "vboot" "devices" mkdir -p "$build_path" -- cgit v1.2.3-70-g09d2 From 99a40b772cb87b03ddce47ec076d13e454ba7caa Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 2 Oct 2017 21:43:09 -0400 Subject: Replace project_action call in depthcharge script It seems like 'project_action_arguments' was the intended function to use, as 'project_action' does not actually /carry out/ the action given as its first argument. --- projects/depthcharge/depthcharge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/depthcharge/depthcharge b/projects/depthcharge/depthcharge index f7645092..fe64c7d9 100755 --- a/projects/depthcharge/depthcharge +++ b/projects/depthcharge/depthcharge @@ -76,7 +76,7 @@ build() { local arch=$( depthcharge_arch "$@" ) local device=$( depthcharge_device "$@" ) - project_action "checkout" "vboot" "devices" + project_action_arguments "checkout" "vboot" "devices" mkdir -p "$build_path" -- cgit v1.2.3-70-g09d2 From 9cb8a33e4c780c522b7ef0e9566acea5ec8a19ab Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 2 Oct 2017 21:51:33 -0400 Subject: Build only libpayload in libpayload build action Helps keep complexity down as well as making scripts easier to maintain if each project only builds itself. --- projects/libpayload/libpayload | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/libpayload/libpayload b/projects/libpayload/libpayload index fc5f8764..de1f0f1d 100755 --- a/projects/libpayload/libpayload +++ b/projects/libpayload/libpayload @@ -47,8 +47,6 @@ build() { local crossgcc_build_path=$( project_build_path "crossgcc" "$arch" ) local crossgcc_bin_path="$crossgcc_build_path/bin/" - project_action "build" "crossgcc" "$arch" - rm -f "$sources_path/.xcompile" mkdir -p "$build_path" -- cgit v1.2.3-70-g09d2 From edd08234cf396d304c5c5b5f874500c0381c08ef Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 2 Oct 2017 22:30:39 -0400 Subject: Modify config* variables in libpayload script 'config' was renamed to 'config_name' to better convey its purpose. Additionally, 'config_path' had its associated string value modified to contain the correct path to the libpayload configuration file. --- projects/libpayload/libpayload | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/libpayload/libpayload b/projects/libpayload/libpayload index de1f0f1d..06c239dd 100755 --- a/projects/libpayload/libpayload +++ b/projects/libpayload/libpayload @@ -39,8 +39,8 @@ build() { local build_path=$( project_build_path "$project" "$@" ) local build_install_path="$build_path/install" - local config=$( libpayload_config "$@" ) - local config_path="configs/$config" + local config_name=$( libpayload_config "$@" ) + local config_path="$sources_path/configs/$config_name" local arch=$( libpayload_arch "$@" ) -- cgit v1.2.3-70-g09d2 From 4d96797d19b46f040508e12fd92dcf80e7f547a5 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Wed, 4 Oct 2017 03:59:36 -0400 Subject: Add separate minnie/speedy libpayload targets In order to avoid additional, fragile, complexity for building depthcharge, libpayload must be built for the minnie/speedy veyron subtargets; this is the simplest way to avoid making special cases in either the depthcharge scripts or the libpayload scripts with respect to ensuring the depthcharge build action can locate the proper libpayload build directory. --- projects/libpayload/configs/depthcharge/veyron/targets | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 projects/libpayload/configs/depthcharge/veyron/targets diff --git a/projects/libpayload/configs/depthcharge/veyron/targets b/projects/libpayload/configs/depthcharge/veyron/targets new file mode 100644 index 00000000..1722192f --- /dev/null +++ b/projects/libpayload/configs/depthcharge/veyron/targets @@ -0,0 +1,2 @@ +minnie +speedy -- cgit v1.2.3-70-g09d2 From e707e69b6cac697b01416187230178b02541fa42 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Wed, 4 Oct 2017 04:02:56 -0400 Subject: Add veyron minnie/speedy depthcharge targets These are necessary so that the build action for depthcharge can locate the correct configuration for veyron targets in the depthcharge source repository. Prior, the build action was looking for 'veyron' instead of 'veyron_minnie' or 'veyron_speedy', causing it to fail. --- projects/depthcharge/configs/veyron/targets | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 projects/depthcharge/configs/veyron/targets diff --git a/projects/depthcharge/configs/veyron/targets b/projects/depthcharge/configs/veyron/targets new file mode 100644 index 00000000..1722192f --- /dev/null +++ b/projects/depthcharge/configs/veyron/targets @@ -0,0 +1,2 @@ +minnie +speedy -- cgit v1.2.3-70-g09d2