diff options
| -rw-r--r-- | config/git/bios_extract/pkg.cfg | 4 | ||||
| -rw-r--r-- | config/git/coreboot/pkg.cfg | 4 | ||||
| -rw-r--r-- | config/git/deguard/pkg.cfg | 4 | ||||
| -rw-r--r-- | config/git/seabios/pkg.cfg | 4 | ||||
| -rw-r--r-- | include/get.sh | 20 | ||||
| -rw-r--r-- | include/tree.sh | 37 |
6 files changed, 29 insertions, 44 deletions
diff --git a/config/git/bios_extract/pkg.cfg b/config/git/bios_extract/pkg.cfg index 8489f385..95879be6 100644 --- a/config/git/bios_extract/pkg.cfg +++ b/config/git/bios_extract/pkg.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later rev="0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0" -url="https://review.coreboot.org/bios_extract" -bkup_url="https://github.com/coreboot/bios_extract" +url="https://github.com/coreboot/bios_extract" +bkup_url="https://review.coreboot.org/bios_extract" diff --git a/config/git/coreboot/pkg.cfg b/config/git/coreboot/pkg.cfg index 2a23ee5c..ee81a0d4 100644 --- a/config/git/coreboot/pkg.cfg +++ b/config/git/coreboot/pkg.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later rev="HEAD" -url="https://review.coreboot.org/coreboot" -bkup_url="https://github.com/coreboot/coreboot.git" +url="https://github.com/coreboot/coreboot.git" +bkup_url="https://review.coreboot.org/coreboot" diff --git a/config/git/deguard/pkg.cfg b/config/git/deguard/pkg.cfg index ea9b0a57..1d560890 100644 --- a/config/git/deguard/pkg.cfg +++ b/config/git/deguard/pkg.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later rev="0ed3e4ff824fc42f71ee22907d0594ded38ba7b2" -url="https://review.coreboot.org/deguard" -bkup_url="https://codeberg.org/libreboot/deguard" +url="https://codeberg.org/libreboot/deguard" +bkup_url="https://review.coreboot.org/deguard" diff --git a/config/git/seabios/pkg.cfg b/config/git/seabios/pkg.cfg index 0ee91a00..4280c6fd 100644 --- a/config/git/seabios/pkg.cfg +++ b/config/git/seabios/pkg.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later rev="HEAD" -url="https://review.coreboot.org/seabios" -bkup_url="https://github.com/coreboot/seabios" +url="https://github.com/coreboot/seabios" +bkup_url="https://review.coreboot.org/seabios" diff --git a/include/get.sh b/include/get.sh index e3e4c311..9ab6956d 100644 --- a/include/get.sh +++ b/include/get.sh @@ -53,14 +53,13 @@ fetch_project() clone_project() { - # if loc is blank, don't create a target - # directory; just update the caches - loc="" if singletree "$project"; then loc="src/$project" - fi - if e "$loc" d missing; then + if [ -d "$loc" ]; then + return 0 + fi + remkdir "${tmpgit%/*}" git_prep "$url" "$bkup_url" \ "$xbmkpwd/config/$project/patches" "$loc" @@ -87,16 +86,7 @@ git_prep() x_ xbmkdir "${_loc%/*}" fi - if [ -z "$_loc" ]; then - # we only used git_prep to update caches, on - # a multi-tree project. tmpgit is useless now. - - x_ rm -Rf "$tmpgit" - else - # actual downloaded - - x_ mv "$tmpgit" "$_loc" - fi + x_ mv "$tmpgit" "$_loc" } fetch_submodule() diff --git a/include/tree.sh b/include/tree.sh index 450d79cf..166a3d86 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -8,7 +8,9 @@ flag="" # macros, overridden depending on the flag +if_do_make="" if_dry_build=":" +if_not_do_make=":" if_not_dry_build="" autoconfargs="" @@ -23,7 +25,6 @@ cmakedir="" cmd="" defconfig="" dest_dir="" -do_make="" elfdir="" forcepull="" gccdir="" @@ -75,24 +76,25 @@ trees() # where only a subset of build tasks are done, # and $if_not_dry_build is prefixed to skipped commands - if_not_dry_build=":" if_dry_build="" + if_not_dry_build=":" ;; -b) : ;; -u) mode="oldconfig" ;; -m) mode="menuconfig" ;; -c) mode="distclean" ;; -x) mode="crossgcc-clean" ;; - -f) # download source code for a project - do_make="n" # lets us know not to build anything - if_not_dry_build=":" + -f|-F) # download source code for a project + # macros. colon means false. + if_do_make=":" if_dry_build="" - ;; - -F) # same as -F, but don't skip git fetch/pull on cache - do_make="n" # lets us know not to build anything + if_not_do_make="" if_not_dry_build=":" - if_dry_build="" - forcepull="y" + if [ "$flag" = "-F" ]; then + # don't skip git fetch/pull on cached src + + forcepull="y" + fi ;; -s) mode="savedefconfig" ;; -l) mode="olddefconfig" ;; @@ -319,12 +321,8 @@ configure_project() break fi - if [ "$do_make" != "n" ]; then - # if we're *downloading* a project, then - # we don't need to to change the target.cfg - + $if_do_make \ break - fi if [ "${_tcfg%/*/target.cfg}" = "${_tcfg%"/$tree/target.cfg"}" ] then # we have found the main source tree that @@ -356,14 +354,11 @@ configure_project() if [ ! -f "CHANGELOG" ]; then delete_old_project_files - fi - if [ "$do_make" = "n" ]; then - if [ ! -f "CHANGELOG" ]; then + $if_not_do_make \ fetch_${cmd#build_} - fi - - return 1 fi + $if_not_do_make \ + return 1 x_ ./mk -f "$project" "$target" } |