From 9b975700e9f2ac09097ab5870e7f71c5b58f5584 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Tue, 10 Oct 2017 15:47:06 -0400 Subject: Correct erroneous project_action() usage 'project_action' does not carry out the given action for a project, contrary to that which the naming may seem to imply. Replacing the usage of the aforementioned with 'project_action_arguments' provides the intended behavior. --- projects/cbfstool/cbfstool | 2 +- projects/cros-ec/cros-ec | 4 ++-- projects/mosys/mosys | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/cbfstool/cbfstool b/projects/cbfstool/cbfstool index 3666eb23..eafe2ba9 100755 --- a/projects/cbfstool/cbfstool +++ b/projects/cbfstool/cbfstool @@ -68,7 +68,7 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - project_action "checkout" "vboot" "devices" + project_action_arguments "checkout" "vboot" "devices" mkdir -p "$build_path" diff --git a/projects/cros-ec/cros-ec b/projects/cros-ec/cros-ec index a8a5a634..d463f5f3 100755 --- a/projects/cros-ec/cros-ec +++ b/projects/cros-ec/cros-ec @@ -81,9 +81,9 @@ build() { local config=$( cros_ec_config "$@" ) - local crossgcc_bin_prefix=$( project_action "prefix" "crossgcc" "$arch" ) + local crossgcc_bin_prefix=$( project_action_arguments "prefix" "crossgcc" "$arch" ) - project_action "build" "crossgcc" "$arch" + project_action_arguments "build" "crossgcc" "$arch" make -C "$sources_path" out="$build_path" CROSS_COMPILE="$crossgcc_bin_prefix" HOST_CROSS_COMPILE= BOARD="$config" -j$TASKS fi diff --git a/projects/mosys/mosys b/projects/mosys/mosys index f0f3345b..145a467d 100755 --- a/projects/mosys/mosys +++ b/projects/mosys/mosys @@ -66,7 +66,7 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - project_action "build" "flashmap" "$@" + project_action_arguments "build" "flashmap" "$@" mkdir -p "$build_path" -- cgit v1.2.3-70-g09d2 From b7e8be6adf2d1b30e1ffcc2472be10af9fe8492d Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Tue, 10 Oct 2017 15:53:34 -0400 Subject: Build only mosys in mosys build action Helps keep projects modular and easier to maintain if each project only builds itself. --- projects/mosys/mosys | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/mosys/mosys b/projects/mosys/mosys index 145a467d..5ac27ee4 100755 --- a/projects/mosys/mosys +++ b/projects/mosys/mosys @@ -66,8 +66,6 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - project_action_arguments "build" "flashmap" "$@" - mkdir -p "$build_path" make -C "$sources_path" objtree="$build_path" "defconfig" -- cgit v1.2.3-70-g09d2 From 92fb3bcfdbff2dee43566f95f6508f19ed7de154 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Tue, 10 Oct 2017 15:56:51 -0400 Subject: Build only CrOS-EC firmware in cros-ec build action Helps keep projects modular and easier to maintain if each project only builds itself. --- projects/cros-ec/cros-ec | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/cros-ec/cros-ec b/projects/cros-ec/cros-ec index d463f5f3..8fb75003 100755 --- a/projects/cros-ec/cros-ec +++ b/projects/cros-ec/cros-ec @@ -83,8 +83,6 @@ build() { local crossgcc_bin_prefix=$( project_action_arguments "prefix" "crossgcc" "$arch" ) - project_action_arguments "build" "crossgcc" "$arch" - make -C "$sources_path" out="$build_path" CROSS_COMPILE="$crossgcc_bin_prefix" HOST_CROSS_COMPILE= BOARD="$config" -j$TASKS fi } -- cgit v1.2.3-70-g09d2