diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/git.sh | 10 | ||||
| -rw-r--r-- | include/rom.sh | 1 | ||||
| -rw-r--r-- | include/vendor.sh | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/include/git.sh b/include/git.sh index 42b04010..a30d3aa4 100644 --- a/include/git.sh +++ b/include/git.sh @@ -61,9 +61,8 @@ git_prep() [ "$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" ] && \ + [ "$XBMK_RELEASE" = "y" ] && rmgit "$tmpgit" move_repo "$_loc" } @@ -77,9 +76,8 @@ prep_submodules() fetch_submodule() { - mcfgdir="$mdir/${1##*/}" - eval "`setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup \ - st`" + mcfgdir="$mdir/${1##*/}"; eval \ + "`setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup st`" [ ! -f "$mcfgdir/module.cfg" ] || . "$mcfgdir/module.cfg" || \ $err "! . $mcfgdir/module.cfg" diff --git a/include/rom.sh b/include/rom.sh index 7e2271f1..0f6fafbf 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -283,6 +283,7 @@ mkcoreboottar() [ "$target" = "$tree" ] && return 0 [ "$XBMK_RELEASE" = "y" ] || return 0 [ "$release" != "n" ] || return 0 + $dry mkrom_tarball "bin/$target" $dry x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke; : } diff --git a/include/vendor.sh b/include/vendor.sh index ceea429a..21b6e806 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -160,7 +160,6 @@ extract_intel_me() extract_intel_me_bruteforce() { [ $# -gt 0 ] && cdir="$1" - e "$_metmp" f && return 0 [ -z "$sdir" ] && sdir="$(mktemp -d)" @@ -537,8 +536,8 @@ process_release_rom() expr "X$xromsize" : "X-\{0,1\}[0123456789][0123456789]*$" \ 1>/dev/null 2>/dev/null || $err "$_xrom size non-integer" - [ $xromsize -lt 2 ] && $err \ - "$_xrom: Will not create empty file. $dontflash" + [ $xromsize -lt 2 ] && \ + $err "$_xrom: Will not create empty file. $dontflash" xromsize="`expr $xromsize - 1`" [ $xromsize -lt 524288 ] && \ |