mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-11 05:52:36 +02:00
general code cleanup in the build system
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
+14
-18
@@ -9,19 +9,18 @@ eval "$(setvars "" MRC_url MRC_url_bkup MRC_hash MRC_board SHELLBALL)"
|
||||
extract_mrc()
|
||||
{
|
||||
[ -z "$MRC_board" ] && $err "extract_mrc $MRC_hash: MRC_board not set"
|
||||
[ -z "${CONFIG_MRC_FILE}" ] && \
|
||||
$err "extract_mrc $MRC_hash: CONFIG_MRC_FILE not set"
|
||||
[ -z "$CONFIG_MRC_FILE" ] && $err "$MRC_hash: CONFIG_MRC_FILE unset"
|
||||
|
||||
SHELLBALL="chromeos-firmwareupdate-${MRC_board}"
|
||||
SHELLBALL="chromeos-firmwareupdate-$MRC_board"
|
||||
|
||||
(
|
||||
x_ cd "${appdir}"
|
||||
x_ cd "$appdir"
|
||||
extract_partition "${MRC_url##*/}"
|
||||
extract_archive "${SHELLBALL}" .
|
||||
extract_archive "$SHELLBALL" .
|
||||
) || $err "mrc download/extract failure"
|
||||
|
||||
"${cbfstool}" "${appdir}/"bios.bin extract -n mrc.bin \
|
||||
-f "$_dest" -r RO_SECTION || $err "extract_mrc: cbfstool $_dest"
|
||||
"$cbfstool" "$appdir/"bios.bin extract -n mrc.bin \
|
||||
-f "$_dest" -r RO_SECTION || $err "extract_mrc: !$cbfstool $_dest"
|
||||
|
||||
[ -n "$CONFIG_REFCODE_BLOB_FILE" ] && extract_refcode; return 0
|
||||
}
|
||||
@@ -32,29 +31,26 @@ extract_partition()
|
||||
ROOTP=$( printf "unit\nB\nprint\nquit\n" | \
|
||||
parted "${1%.zip}" 2>/dev/null | grep "ROOT-A" )
|
||||
|
||||
START=$(( $( echo ${ROOTP} | cut -f2 -d\ | tr -d "B" ) ))
|
||||
SIZE=$(( $( echo ${ROOTP} | cut -f4 -d\ | tr -d "B" ) ))
|
||||
START=$(( $( echo $ROOTP | cut -f2 -d\ | tr -d "B" ) ))
|
||||
SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) ))
|
||||
|
||||
dd if="${1%.zip}" of="root-a.ext2" bs=1024 \
|
||||
skip=$(( ${START} / 1024 )) count=$(( ${SIZE} / 1024 )) || \
|
||||
$err "extract_partition, dd ${1%.zip}, root-a.ext2"
|
||||
dd if="${1%.zip}" of="root-a.ext2" bs=1024 skip=$(( $START / 1024 )) \
|
||||
count=$(( $SIZE / 1024 )) || $err "ex dd ${1%.zip}, root-a.ext2"
|
||||
|
||||
printf "cd /usr/sbin\ndump chromeos-firmwareupdate ${SHELLBALL}\nquit" \
|
||||
printf "cd /usr/sbin\ndump chromeos-firmwareupdate $SHELLBALL\nquit" \
|
||||
| debugfs "root-a.ext2" || $err "can't extract shellball"
|
||||
}
|
||||
|
||||
extract_refcode()
|
||||
{
|
||||
_refdest="${CONFIG_REFCODE_BLOB_FILE##*../}"
|
||||
[ -f "$_refdest" ] && return 0
|
||||
e "$_refdest" f && return 0
|
||||
|
||||
# cbfstool changed the attributes scheme for stage files,
|
||||
# incompatible with older versions before coreboot 4.14,
|
||||
# so we need coreboot 4.13 cbfstool for certain refcode files
|
||||
[ -n "$cbfstoolref" ] || \
|
||||
$err "extract_refcode $board: MRC_refcode_cbtree not set"
|
||||
mkdir -p "${_refdest%/*}" || \
|
||||
$err "extract_refcode $board: !mkdir -p ${_refdest%/*}"
|
||||
[ -n "$cbfstoolref" ] || $err "$board: MRC_refcode_cbtree not set"
|
||||
mkdir -p "${_refdest%/*}" || $err "ref: !mkdir -p ${_refdest%/*}"
|
||||
|
||||
"$cbfstoolref" "$appdir/bios.bin" extract \
|
||||
-m x86 -n fallback/refcode -f "$_refdest" -r RO_SECTION \
|
||||
|
||||
Reference in New Issue
Block a user