diff options
Diffstat (limited to 'include/git.sh')
| -rw-r--r-- | include/git.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/include/git.sh b/include/git.sh index 4fa904ba..9be79527 100644 --- a/include/git.sh +++ b/include/git.sh @@ -9,8 +9,6 @@ tmpgit="$xbmkpwd/tmp/gitclone" fetch_targets() { - [ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \ - x_ ./mk -f "$project" "$tree_depend" e "src/$project/$tree" d && return 0 printf "Creating %s tree %s\n" "$project" "$tree" @@ -21,7 +19,7 @@ fetch_targets() fetch_project() { - eval "`setvars "" xtree tree_depend`" + eval "`setvars "" xtree`" eval "`setcfg "config/git/$project/pkg.cfg"`" chkvars url @@ -61,12 +59,6 @@ git_prep() done < "$mdir/module.list"; : fi - if [ "$project" = "coreboot" ] && [ -n "$xtree" ] && [ $# -gt 2 ] && \ - [ "$xtree" != "$tree" ]; then ( - x_ cd "$tmpgit/util" && x_ rm -Rf crossgcc - x_ ln -s "../../$xtree/util/crossgcc" crossgcc - ) || $err "$_loc: !xgcc link"; fi - [ "$_loc" != "$XBMK_CACHE/repo/$project" ] && \ [ "$XBMK_RELEASE" = "y" ] && rmgit "$tmpgit" @@ -74,6 +66,15 @@ git_prep() mv "$tmpgit" "$_loc" || $err "git_prep: !mv $tmpgit $_loc" } +# return 0 if project is single-tree, otherwise 1 +# e.g. coreboot is multi-tree, so 1 +singletree() +{ + for targetfile in "config/${1}/"*/target.cfg; do + [ -e "$targetfile" ] && [ -f "$targetfile" ] && return 1; : + done; : +} + fetch_submodule() { mcfgdir="$mdir/${1##*/}"; eval \ @@ -90,7 +91,7 @@ fetch_submodule() [ -z "$st" ] && return 0 # subrepo/subfile not defined chkvars "sub${st}" "sub${st}_bkup" "subhash" - [ "$st" = "file" ] && download "$subfile" "$subfile_bkup" \ + [ "$st" = "file" ] && xbmkget "$subfile" "$subfile_bkup" \ "$tmpgit/$1" "$subhash" && return 0 rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'" tmpclone "$subrepo" "$subrepo_bkup" "$tmpgit/$1" "$subhash" \ |