From 0848622799b8c627cd650d848ffa7d592d80b26d Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 17 Aug 2023 11:41:58 +0100 Subject: remove download scripts, consolidate into script most of them were just calling the gitclone script, so remove them. the grub script was treating gnulib as a dependency. i've now added the ability to grab 1 dependency, in the gitclone script (it should be expanded later to support multiple dependencies) the gitclone script has been renamed to "fetch". the "fetch_trees" script does more or less the same thing, but calls "fetch" and handles multiple revisions if a project needs that this is more efficient, and slightly reduces the code size of lbmk! Signed-off-by: Leah Rowe --- resources/scripts/update/blobs/download | 10 +- resources/scripts/update/blobs/extract | 6 +- resources/scripts/update/blobs/mrc | 186 ++++++++++++++++++++++++++++++++ 3 files changed, 194 insertions(+), 8 deletions(-) create mode 100755 resources/scripts/update/blobs/mrc (limited to 'resources/scripts/update/blobs') diff --git a/resources/scripts/update/blobs/download b/resources/scripts/update/blobs/download index b4b74c1b..0a28778a 100755 --- a/resources/scripts/update/blobs/download +++ b/resources/scripts/update/blobs/download @@ -184,7 +184,7 @@ build_dependencies() { if [ ! -d me_cleaner ]; then printf "downloading me_cleaner\n" - ./download me_cleaner || fail "could not download me_cleaner" + ./fetch me_cleaner || fail "could not download me_cleaner" fi if [ ! -d ${cbdir} ]; then printf "downloading coreboot\n" @@ -193,17 +193,17 @@ build_dependencies() fi if [ ! -d bios_extract ]; then printf "downloading bios_extract\n" - ./download bios_extract \ + ./fetch bios_extract \ || fail "could not download bios_extract" fi if [ ! -d biosutilities ]; then printf "downloading biosutilities\n" - ./download biosutilities \ + ./fetch biosutilities \ || fail "could not download biosutilities" fi if [ ! -d uefitool ]; then printf "download uefitool (for UEFIExtract)\n" - ./download uefitool \ + ./fetch uefitool \ || fail "could not download uefitool" fi if [ ! -f uefitool/uefiextract ]; then @@ -239,7 +239,7 @@ download_blobs() download_e6400vga || _failed="${_failed} e6400vga" ;; *MRC*) - ./download mrc || _failed="${_failed} mrc" + ./update blobs mrc || _failed="${_failed} mrc" ;; esac done diff --git a/resources/scripts/update/blobs/extract b/resources/scripts/update/blobs/extract index 63d09c02..5ac8e91c 100755 --- a/resources/scripts/update/blobs/extract +++ b/resources/scripts/update/blobs/extract @@ -58,10 +58,10 @@ build_dependencies() { if [ ! -d me_cleaner ]; then printf "downloading me_cleaner\n" - ./download me_cleaner || fail 'could not download me_cleaner' + ./fetch me_cleaner || fail 'could not download me_cleaner' else printf "me_cleaner already downloaded. Skipping.\n" - printf "run ./download me_cleaner to manually overwrite\n" + printf "run ./fetch me_cleaner to manually overwrite\n" fi if [ ! -d ${cbdir} ]; then @@ -90,7 +90,7 @@ extract_blobs() if [ "$CONFIG_HAVE_MRC" = "y" ]; then printf 'haswell board detected, downloading mrc\n' - ./download mrc || fail "could not download mrc" + ./update blobs mrc || fail "could not download mrc" fi _me_destination=${CONFIG_ME_BIN_PATH#../../} diff --git a/resources/scripts/update/blobs/mrc b/resources/scripts/update/blobs/mrc new file mode 100755 index 00000000..84e79f62 --- /dev/null +++ b/resources/scripts/update/blobs/mrc @@ -0,0 +1,186 @@ +#!/usr/bin/env sh + +# Download Intel MRC images +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e +export PATH="${PATH}:/sbin" + +# This file is forked from util/chromeos/crosfirmware.sh in coreboot cfc26ce278 +# Changes to it in *this version* are copyright 2021 and 2023 Leah Rowe, under +# the same license as above. + +# use updated manifest from wayback machine, when updating mrc.bin, +# and update the other variables below accordingly. current manifest used: +# https://web.archive.org/web/20210211071412/https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf + +# the wayback machine is used so that we get the same manifest. google +# does not seem to version the manifest, but archives are available + +# variables taken from that manifest: + +_board="peppy" +_file="chromeos_12239.92.0_peppy_recovery_stable-channel_mp-v3.bin" +_url="https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_12239.92.0_peppy_recovery_stable-channel_mp-v3.bin.zip" +_url2="https://web.archive.org/web/20200516070928/https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_12239.92.0_peppy_recovery_stable-channel_mp-v3.bin.zip" +_sha1sum="cd5917cbe7f821ad769bf0fd87046898f9e175c8" +_mrc_complete_hash="d18de1e3d52c0815b82ea406ca07897c56c65696" +_mrc_complete="mrc/haswell/mrc.bin" + +cbdir="coreboot/default" +cbfstool="cbutils/default/cbfstool" + +sname="" + +main() +{ + sname=${0} + printf "Downloading Intel MRC blobs\n" + + check_existing && exit 0 + build_dependencies || fail "could not build dependencies" + fetch_mrc || fail "could not fetch mrc.bin" +} + +check_existing() +{ + if [ ! -f ${_mrc_complete} ]; then + return 1 + fi + printf 'found existing mrc.bin, checking its hash\n' + if [ "$(sha1sum ${_mrc_complete} | awk '{print $1}')" \ + = "${_mrc_complete_hash}" ]; then + printf 'checksums matched, skipping downloading\n' + return 0 + else + printf 'hashes did not match, starting over\n' + return 1 + fi +} + +build_dependencies() +{ + if [ ! -d "${cbdir}/" ]; then + ./fetch_trees coreboot default || return 1 + fi + ./build module cbutils default || return 1 + return 0 +} + +fetch_mrc() +{ + mkdir -p mrc/haswell/ || return 1 + + ( + cd mrc/haswell/ + + download_image ${_url} ${_file} ${_sha1sum} + if [ ! -f ${_file} ]; then + download_image ${_url2} ${_file} ${_sha1sum} + fi + if [ ! -f $_file ]; then + fail "%{_file} not downloaded / verification failed." + fi + + extract_partition ROOT-A ${_file} root-a.ext2 + extract_shellball root-a.ext2 chromeos-firmwareupdate-${_board} + + extract_coreboot chromeos-firmwareupdate-${_board} + + ../../${cbfstool} coreboot-*.bin extract -f mrc.bin \ + -n mrc.bin -r RO_SECTION \ + || fail "Could not fetch mrc.bin" + rm -f "chromeos-firmwareupdate-${_board}" coreboot-*.bin \ + "${_file}" "root-a.ext2" + + printf "\n\nmrc.bin saved to ${_mrc_complete}\n\n" + ) + + return 0 +} + +download_image() +{ + url=${1} + _file=${2} + _sha1sum=${3} + + echo "Downloading recovery image" + curl "$url" > "$_file.zip" + if [ "$(sha1sum ${_file}.zip | awk '{print $1}')" = "${_sha1sum}" ] + then + unzip -q "${_file}.zip" + rm "${_file}.zip" + echo "Checksum verification passed for recovery image." + return 0 + else + rm "${_file}.zip" + echo "Bad checksum. Recovery image deleted." + return 1 + fi +} + +extract_partition() +{ + NAME=${1} + FILE=${2} + ROOTFS=${3} + _bs=1024 + + echo "Extracting ROOT-A partition" + ROOTP=$( printf "unit\nB\nprint\nquit\n" | \ + parted ${FILE} 2>/dev/null | grep ${NAME} ) + + START=$(( $( echo ${ROOTP} | cut -f2 -d\ | tr -d "B" ) )) + SIZE=$(( $( echo ${ROOTP} | cut -f4 -d\ | tr -d "B" ) )) + + dd if=${FILE} of=${ROOTFS} bs=${_bs} skip=$(( ${START} / ${_bs} )) \ + count=$(( ${SIZE} / ${_bs} )) > /dev/null +} + +extract_shellball() +{ + ROOTFS=${1} + SHELLBALL=${2} + + echo "Extracting chromeos-firmwareupdate" + printf "cd /usr/sbin\ndump chromeos-firmwareupdate ${SHELLBALL}\nquit" \ + | debugfs ${ROOTFS} > /dev/null 2>&1 +} + +extract_coreboot() +{ + _shellball=${1} + _unpacked=$( mktemp -d ) + + echo "Extracting coreboot image" + sh ${_shellball} --unpack ${_unpacked} > /dev/null + + _version=$( cat ${_unpacked}/VERSION | grep BIOS\ version: | \ + cut -f2 -d: | tr -d \ ) + + cp ${_unpacked}/bios.bin coreboot-${_version}.bin + rm -r "${_unpacked}" +} + +fail() +{ + printf "%s: ERROR: %s\n" + ${sname} ${1} + exit 1 +} + +main $@ -- cgit v1.2.1