diff options
| -rw-r--r-- | include/lib.sh | 2 | ||||
| -rw-r--r-- | include/vendor.sh | 7 | ||||
| -rwxr-xr-x | mk | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/lib.sh b/include/lib.sh index cb8e0303..e0c9b1a2 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -200,7 +200,7 @@ mktarball() if [ "${2%/*}" != "$2" ]; then mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\"" fi - tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || $err "mktarball 2, $1" + x_ tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || $err "mktarball2, $1" } mksha512sum() diff --git a/include/vendor.sh b/include/vendor.sh index 412105c7..ceea429a 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -190,7 +190,7 @@ extract_intel_me_bruteforce() cdir="$1"; [ "${cdir#/a}" != "$cdir" ] && cdir="${cdir#/}" cd "$cdir" || : done - ) + ) || : rm -Rf "$sdir" || $err "extract_intel_me: !rm -Rf $sdir - $dontflash" } @@ -486,6 +486,7 @@ patch_release_roms() "$vguide" > "$tmpromdir/README.md" || : else printf "Skipping vendorfiles on '%s'\n" "$archive" 1>&2 + need_files="n" fi ( @@ -625,12 +626,8 @@ inject() $err "failed: inject '$_t' '$_dest' on '$rom'" [ "$nukemode" != "nuke" ] || "$ifdtool" $ifdprefix --nuke $_t \ "$rom" -O "$rom" || $err "$rom: !nuke IFD/$_t" - xchanged="y" - return 0 elif [ "$nukemode" = "nuke" ]; then x_ "$cbfstool" "$rom" remove -n "$cbfsname" - xchanged="y" - return 0 elif [ "$_t" = "stage" ]; then # the only stage we handle is refcode x_ mkdir -p tmp x_ rm -f "tmp/refcode" @@ -309,7 +309,7 @@ check_project_hashes() $err "!sort project tmp/list" while read -r rmchk; do - [ ! -f "$rmchk" ] || sha512sum "$rmchk" | awk \ + [ ! -f "$rmchk" ] || x_ sha512sum "$rmchk" | awk \ '{print $1}' >> "$TMPDIR/project.hash" || $err "!h $rmchk" done < "$TMPDIR/project.list" |