mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-09-19 21:20:31 +02:00
Compare commits
2 Commits
089875ac1f
...
60a2f5cbff
| Author | SHA1 | Date | |
|---|---|---|---|
| 60a2f5cbff | |||
| 3b565ce056 |
+1
-1
@@ -80,7 +80,7 @@ corebootpremake()
|
|||||||
cook_coreboot_config()
|
cook_coreboot_config()
|
||||||
{
|
{
|
||||||
if [ -z "$mode" ] && [ -f "$srcdir/.config" ]; then
|
if [ -z "$mode" ] && [ -f "$srcdir/.config" ]; then
|
||||||
printf "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || \
|
printf "CONFIG_CCACHE=n\n" >> "$srcdir/.config" || \
|
||||||
err "can't cook '$srcdir'" "cook_coreboot_config" "$@"
|
err "can't cook '$srcdir'" "cook_coreboot_config" "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-23
@@ -122,42 +122,31 @@ fetch()
|
|||||||
remkdir "${_pre_dest%/*}" "$appdir"
|
remkdir "${_pre_dest%/*}" "$appdir"
|
||||||
|
|
||||||
# HACK: if grabbing fsp from coreboot, fix the path for lbmk
|
# HACK: if grabbing fsp from coreboot, fix the path for lbmk
|
||||||
if [ "$dl_type" = "fsp" ]; then
|
[ "$dl_type" = "fsp" ] && for bkup in "" "_bkup"; do
|
||||||
dl="${dl##*../}"
|
eval "dl$bkup=\"\${dl$bkup##*../}\""
|
||||||
_cdp="$dl"
|
eval "_cdp=\"\$dl$bkup\""
|
||||||
|
|
||||||
[ ! -f "$_cdp" ] && \
|
[ ! -f "$_cdp" ] && \
|
||||||
_cdp="$cbdir/$_cdp"
|
_cdp="$cbdir/$_cdp"
|
||||||
[ -f "$_cdp" ] && \
|
[ -f "$_cdp" ] && \
|
||||||
dl="$_cdp"
|
eval "dl$bkup=\"\$_cdp\""; :
|
||||||
|
done; :
|
||||||
dl_bkup="${dl_bkup##*../}"
|
|
||||||
_cdp="$dl_bkup"
|
|
||||||
|
|
||||||
[ ! -f "$_cdp" ] && \
|
|
||||||
_cdp="$cbdir/$_cdp"
|
|
||||||
[ -f "$_cdp" ] && \
|
|
||||||
dl_bkup="$_cdp"; :
|
|
||||||
fi
|
|
||||||
|
|
||||||
# download the file (from the internet) to extract from:
|
# download the file (from the internet) to extract from:
|
||||||
|
|
||||||
xbget "$dlop" "$dl" "$dl_bkup" "$_dl" "$dlsum"
|
xbget "$dlop" "$dl" "$dl_bkup" "$_dl" "$dlsum"
|
||||||
x_ rm -Rf "${_dl}_extracted"
|
x_ rm -Rf "${_dl}_extracted"
|
||||||
|
|
||||||
# skip extraction if a cached extracted file exists:
|
# skip extraction if a cached extracted file exists:
|
||||||
|
|
||||||
( xbget copy "$_dl_bin" "$_dl_bin" "$_dest" "$binsum" 2>/dev/null ) || :
|
( xbget copy "$_dl_bin" "$_dl_bin" "$_dest" "$binsum" 2>/dev/null ) || :
|
||||||
[ -f "$_dest" ] && \
|
[ -f "$_dest" ] && \
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
x_ mkdir -p "${_dest%/*}"
|
x_ mkdir -p "${_dest%/*}"
|
||||||
|
|
||||||
if [ "$dl_type" != "fsp" ]; then
|
[ "$dl_type" = "fsp" ] || \
|
||||||
extract_archive "$_dl" "$appdir" || \
|
extract_archive "$_dl" "$appdir" || \
|
||||||
[ "$dl_type" = "e6400vga" ] || \
|
[ "$dl_type" = "e6400vga" ] || \
|
||||||
err "$_dest $dl_type: !extract" "fetch" "$@"
|
err "$_dest $dl_type: !extract" "fetch" "$@"
|
||||||
fi
|
|
||||||
|
|
||||||
x_ extract_$dl_type "$_dl" "$appdir"
|
x_ extract_$dl_type "$_dl" "$appdir"
|
||||||
set -u -e
|
set -u -e
|
||||||
@@ -172,13 +161,9 @@ fetch()
|
|||||||
return 0; :
|
return 0; :
|
||||||
|
|
||||||
[ -z "$binsum" ] && \
|
[ -z "$binsum" ] && \
|
||||||
printf "'%s': checksum undefined\n" "$_dest" 1>&2
|
printf "WARNING: %s: checksum undefined\n" "$_dest" 1>&2
|
||||||
|
|
||||||
if [ -L "$_dest" ]; then
|
x_ rm -f "$_dest"
|
||||||
printf "WARNING: '%s' is a link!\n" "$_dest" 1>&2
|
|
||||||
else
|
|
||||||
x_ rm -f "$_dest"
|
|
||||||
fi
|
|
||||||
|
|
||||||
err "Can't safely extract '$_dest', for board '$board'" "fetch" "$@"
|
err "Can't safely extract '$_dest', for board '$board'" "fetch" "$@"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user