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(-) (limited to 'projects/libpayload') 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(-) (limited to 'projects/libpayload') 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 (limited to 'projects/libpayload') 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