From 71cf7f9db16310935481ea772b2bf1eb26376f3b Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Tue, 6 Dec 2022 19:44:58 +0300 Subject: download/u-boot: Remove support for deleting git folders Removing the git dirs was part of deblobbing, which Libreboot no longer cares about. The variable that triggers it is no more. Remove the dead code. Signed-off-by: Alper Nebi Yasak --- resources/scripts/download/u-boot | 9 --------- 1 file changed, 9 deletions(-) (limited to 'resources/scripts/download/u-boot') diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot index 5b6a160e..692f34bf 100755 --- a/resources/scripts/download/u-boot +++ b/resources/scripts/download/u-boot @@ -235,11 +235,6 @@ if [ $# -eq 0 ] ; then for board in $(list_supported_boards); do download_uboot_board "${board}" done - - if [ "${deletegit}" = "true" ]; then - rm -rf u-boot/u-boot/ u-boot/.git* - fi - exit 0 elif [ $# -eq 1 -a "$1" == "--help" ] ; then usage @@ -255,10 +250,6 @@ elif [ $# -eq 1 ] ; then fi done - if [ "${deletegit}" = "true" ]; then - rm -rf u-boot/u-boot/ u-boot/.git* - fi - printf "Error: Board '${1}' is not supported\n" exit 1 -- cgit v1.2.1 From 2b761f2f8a4193457a73c4dff335029f70b4443e Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Tue, 6 Dec 2022 19:49:02 +0300 Subject: download/u-boot: Re-add usage text for no-argument form The no-argument form of the U-Boot download script prepare trees for all boards when run with no arguments, like the corresponding script for coreboot. The usage text for this case was removed without any changes to the corresponding code, assume it was by mistake and add it back. Signed-off-by: Alper Nebi Yasak --- resources/scripts/download/u-boot | 3 +++ 1 file changed, 3 insertions(+) (limited to 'resources/scripts/download/u-boot') diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot index 692f34bf..d388dd39 100755 --- a/resources/scripts/download/u-boot +++ b/resources/scripts/download/u-boot @@ -207,6 +207,9 @@ usage() progname="./download u-boot" printf "Usage:\n" + printf "\t%s # %s\n" \ + "${progname}" \ + "Download u-boot for all boards" printf "\t%s [board] # %s\n" \ "${progname}" \ "Download u-boot for the given board" -- cgit v1.2.1 From 584210bd1f2ff8e2f7a85b8fbc85013f16b7d7ef Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 8 Dec 2022 00:12:47 +0300 Subject: download/u-boot: Change to download target before running extra.sh The U-Boot download script does its work from the repository root instead going into the newly created dirs, unlike the coreboot counterpart. It should run the board-specific extra.sh files with the downloaded paths as their working directory. Do so by a subshell. Signed-off-by: Alper Nebi Yasak --- resources/scripts/download/u-boot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/download/u-boot') diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot index d388dd39..1af513a4 100755 --- a/resources/scripts/download/u-boot +++ b/resources/scripts/download/u-boot @@ -181,7 +181,7 @@ downloadfor() { # extra.sh on a per-board basis # In fact, extra.sh can be used for anything you want. if [ -f "resources/u-boot/${board}/extra.sh" ]; then - "resources/u-boot/${board}/extra.sh" || touch build_error + ( cd "${ubtree}" && "../../resources/u-boot/${board}/extra.sh"; ) || touch build_error if [ -f build_error ]; then return 1 fi -- cgit v1.2.1