diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/git.sh | 6 | ||||
| -rwxr-xr-x | include/lib.sh | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/git.sh b/include/git.sh index e7fe28b5..ec1ecdd3 100755 --- a/include/git.sh +++ b/include/git.sh @@ -103,17 +103,17 @@ git_prep() prep_submodules() { - [ -f "$tmpgit/.gitmodules" ] || return 0 - mdir="$PWD/config/submodule/$project" [ -n "$tree" ] && mdir="$mdir/$tree" if [ -f "$mdir/module.list" ]; then cat "$mdir/module.list" > "$tmpdir/modules" || \ $err "!cp $mdir/module.list $tmpdir/modules" - else + elif [ -f "$tmpgit/.gitmodules" ]; then git -C "$tmpgit" submodule status | awk '{print $2}' > \ "$tmpdir/modules" || $err "$mdir: cannot list submodules" + else + return 0 fi while read -r msrcdir; do diff --git a/include/lib.sh b/include/lib.sh index eff55511..44ec3623 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -11,10 +11,8 @@ cbdir="src/coreboot/default" cbcfgsdir="config/coreboot" ifdtool="cbutils/default/ifdtool" cbfstool="cbutils/default/cbfstool" -grubcfgsdir="config/grub" -layoutdir="/boot/grub/layouts" -. "$grubcfgsdir/modules.list" tmpgit="$PWD/tmp/gitclone" +grubdata="config/data/grub" err="err_" err_() |