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/module/bios_extract | 22 --- resources/scripts/update/module/biosutilities | 22 --- resources/scripts/update/module/flashrom | 24 ---- resources/scripts/update/module/grub | 32 ----- resources/scripts/update/module/me_cleaner | 25 ---- resources/scripts/update/module/memtest86plus | 32 ----- resources/scripts/update/module/mrc | 186 -------------------------- resources/scripts/update/module/seabios | 29 ---- resources/scripts/update/module/uefitool | 22 --- 9 files changed, 394 deletions(-) delete mode 100755 resources/scripts/update/module/bios_extract delete mode 100755 resources/scripts/update/module/biosutilities delete mode 100755 resources/scripts/update/module/flashrom delete mode 100755 resources/scripts/update/module/grub delete mode 100755 resources/scripts/update/module/me_cleaner delete mode 100755 resources/scripts/update/module/memtest86plus delete mode 100755 resources/scripts/update/module/mrc delete mode 100755 resources/scripts/update/module/seabios delete mode 100755 resources/scripts/update/module/uefitool (limited to 'resources/scripts/update/module') diff --git a/resources/scripts/update/module/bios_extract b/resources/scripts/update/module/bios_extract deleted file mode 100755 index 1688aabe..00000000 --- a/resources/scripts/update/module/bios_extract +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env sh -# -# Copyright (C) 2023 Leah Rowe -# -# 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, either version 3 of the License, or -# (at your option) any later version. -# -# 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 - -./gitclone bios_extract diff --git a/resources/scripts/update/module/biosutilities b/resources/scripts/update/module/biosutilities deleted file mode 100755 index c6de36b1..00000000 --- a/resources/scripts/update/module/biosutilities +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env sh -# -# Copyright (C) 2023 Leah Rowe -# -# 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, either version 3 of the License, or -# (at your option) any later version. -# -# 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 - -./gitclone biosutilities diff --git a/resources/scripts/update/module/flashrom b/resources/scripts/update/module/flashrom deleted file mode 100755 index def33ffb..00000000 --- a/resources/scripts/update/module/flashrom +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env sh - -# helper script: downloads flashrom and patches it -# -# Copyright (C) 2014, 2015, 2020, 2021 Leah Rowe -# -# 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, either version 3 of the License, or -# (at your option) any later version. -# -# 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 - -./gitclone flashrom diff --git a/resources/scripts/update/module/grub b/resources/scripts/update/module/grub deleted file mode 100755 index ff1ce55c..00000000 --- a/resources/scripts/update/module/grub +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env sh - -# helper script: Downloads GRUB and patches it. -# -# Copyright (C) 2014,2015,2016,2020,2021,2023 Leah Rowe -# -# -# 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, either version 3 of the License, or -# (at your option) any later version. -# -# 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 - -./gitclone grub -./gitclone gnulib || rm -Rf grub/ -if [ ! -d grub ]; then - printf "%s: Could not download grub and gnulib\n" ${0} - exit 1 -else - exit 0 -fi diff --git a/resources/scripts/update/module/me_cleaner b/resources/scripts/update/module/me_cleaner deleted file mode 100755 index 93173257..00000000 --- a/resources/scripts/update/module/me_cleaner +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env sh -# -# Copyright (C) 2020 Leah Rowe -# -# 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, either version 3 of the License, or -# (at your option) any later version. -# -# 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 . -# - -# This script assumes that the working directory is the -# root of retroboot_src or retroboot git. - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -./gitclone me_cleaner diff --git a/resources/scripts/update/module/memtest86plus b/resources/scripts/update/module/memtest86plus deleted file mode 100755 index e4106f38..00000000 --- a/resources/scripts/update/module/memtest86plus +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env sh - -# helper script: Downloads MemTest86+ and patches it -# -# Copyright (C) 2014, 2015, 2020, 2021 Leah Rowe -# Copyright (C) 2015 Joseph Michael Thompson -# Copyright (C) 2015 Klemens Nanni -# -# 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, either version 3 of the License, or -# (at your option) any later version. -# -# 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 - -# Get the last version of MemTest86+ used, apply patches, build it. - -# Remove the old version that may exist -# ------------------------------------------------------------------------------ - -printf "Downloading MemTest86+\n" -./gitclone memtest86plus diff --git a/resources/scripts/update/module/mrc b/resources/scripts/update/module/mrc deleted file mode 100755 index 84e79f62..00000000 --- a/resources/scripts/update/module/mrc +++ /dev/null @@ -1,186 +0,0 @@ -#!/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 $@ diff --git a/resources/scripts/update/module/seabios b/resources/scripts/update/module/seabios deleted file mode 100755 index 666c32ae..00000000 --- a/resources/scripts/update/module/seabios +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh -# -# Copyright (C) 2015, 2016, 2021 Leah Rowe -# -# 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, either version 3 of the License, or -# (at your option) any later version. -# -# 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 - -# Get SeaBIOS, revert to commit last used and apply patches. - -# Remove the old version that may still exist -# ------------------------------------------------------------------------------ - -printf "Downloading SeaBIOS\n" - -./gitclone seabios diff --git a/resources/scripts/update/module/uefitool b/resources/scripts/update/module/uefitool deleted file mode 100755 index cd376895..00000000 --- a/resources/scripts/update/module/uefitool +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env sh -# -# Copyright (C) 2023 Leah Rowe -# -# 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, either version 3 of the License, or -# (at your option) any later version. -# -# 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 - -./gitclone uefitool -- cgit v1.2.1