diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/git.sh | 6 | ||||
| -rw-r--r-- | include/rom.sh | 3 | ||||
| -rw-r--r-- | include/vendor.sh | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/include/git.sh b/include/git.sh index 21a1f3b7..e5aa4861 100644 --- a/include/git.sh +++ b/include/git.sh @@ -51,12 +51,14 @@ git_prep() chkvars rev; tmpclone "$1" "$2" "$tmpgit" "$rev" "$_patchdir" if singletree "$project" || [ $# -gt 4 ]; then - prep_submodules "$_loc"; fi + prep_submodules "$_loc" + fi [ "$project" = "coreboot" ] && [ -n "$xtree" ] && [ $# -gt 2 ] && \ [ "$xtree" != "$tree" ] && link_crossgcc "$_loc" [ "$XBMK_RELEASE" = "y" ] && \ - [ "$_loc" != "$XBMK_CACHE/repo/$project" ] && rmgit "$tmpgit" + [ "$_loc" != "$XBMK_CACHE/repo/$project" ] && \ + rmgit "$tmpgit" move_repo "$_loc" } diff --git a/include/rom.sh b/include/rom.sh index 3e8c9c9b..dde17b69 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -119,7 +119,8 @@ mkcorebootbin() tmprom="$TMPDIR/coreboot.rom" $dry x_ cp "$srcdir/build/coreboot.rom" "$tmprom" - initmode="${defconfig##*/}"; displaymode="${initmode##*_}" + initmode="${defconfig##*/}" + displaymode="${initmode##*_}" [ "$displaymode" = "$initmode" ] && displaymode="" # "normal" config initmode="${initmode%%_*}" cbfstool="elf/cbfstool/$tree/cbfstool" diff --git a/include/vendor.sh b/include/vendor.sh index fb7d7cdf..018e734b 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -110,6 +110,7 @@ getfiles() fetch() { dl_type="$1"; dl="$2"; dl_bkup="$3"; dlsum="$4"; _dest="${5##*../}" + [ "$5" = "/dev/null" ] && return 0; _dl="$XBMK_CACHE/file/$dlsum" if [ "$dl_type" = "fspm" ] || [ "$dl_type" = "fsps" ]; then # HACK: if grabbing fsp from coreboot, fix the path for lbmk @@ -559,7 +560,9 @@ patch_release_roms() process_release_rom() { - _xrom="$1"; _xromname="${1##*/}" + _xrom="$1" + _xromname="${1##*/}" + [ -L "$_xrom" ] && \ $err "$archive -> '${_xrom#"tmp/DO_NOT_FLASH/"}' is a symlink" [ -f "$_xrom" ] || return 0 @@ -709,7 +712,8 @@ inject() else "$cbfstool" "$rom" add -f "$_dest" -n "$cbfsname" \ -t $_t $_offset || $err "$rom !add $_t ($_dest)" - fi; xchanged="y"; : + fi + xchanged="y"; : } modify_mac_addresses() |