From 2d483d2f5c3716f26bced0d9305a68475cc38f7e Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 6 Oct 2023 02:33:53 +0100 Subject: move build/release/* to update/release Signed-off-by: Leah Rowe --- script/build/release/roms | 168 --------------------------------------------- script/build/release/src | 128 ---------------------------------- script/update/release/roms | 168 +++++++++++++++++++++++++++++++++++++++++++++ script/update/release/src | 128 ++++++++++++++++++++++++++++++++++ 4 files changed, 296 insertions(+), 296 deletions(-) delete mode 100755 script/build/release/roms delete mode 100755 script/build/release/src create mode 100755 script/update/release/roms create mode 100755 script/update/release/src diff --git a/script/build/release/roms b/script/build/release/roms deleted file mode 100755 index 3cf5d93e..00000000 --- a/script/build/release/roms +++ /dev/null @@ -1,168 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2020,2021,2022,2023 Leah Rowe - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -. "include/err.sh" - -read projectname < projectname -version="version-unknown" -versiondate="version-date-unknown" -tree="default" -eval "$(setvars "" target CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ - CONFIG_KBC1126_FIRMWARE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW)" -ifdtool="cbutils/${tree}/ifdtool" -cbfstool="cbutils/${tree}/cbfstool" -microcode_required="y" - -main() -{ - printf "Building ROM image archives for version %s\n" "${version}" - - init_check - for romdir in bin/*; do - [ -d "${romdir}" ] || continue - make_archive "${romdir}" - done - printf "\nROM archives available at release/%s/roms/\n\n" "${version}" -} - -init_check() -{ - [ -f version ] && read version < version - [ -f versiondate ] && read versiondate < versiondate - [ ! -d "bin/" ] && \ - err "init_check: no ROMs built yet (error)" - [ -d "release/" ] || \ - x_ mkdir -p release/ - [ -d "release/${version}/" ] || \ - x_ mkdir -p "release/${version}/" - [ ! -d "release/${version}/roms/" ] || \ - x_ rm -Rf "release/${version}/roms/" - [ -d "release/${version}/roms/" ] && return 0 - x_ mkdir -p "release/${version}/roms/" -} - -make_archive() -{ - builddir="${1}" - romdir="tmp/romdir" - x_ rm -Rf "${romdir}" - target="${builddir##*/}" - - if [ ! -f "config/coreboot/${target}/target.cfg" ]; then - # No config, just make a tarball - tarball=release/${version}/roms/${target}_${version}.tar.xz - x_ tar -c "${builddir}" | xz -T0 -6 > ${tarball} || \ - x_ rm -f ${tarball} - return 0 - fi - - romdir="${romdir}/bin/${target}" - x_ mkdir -p "${romdir}" - x_ cp "${builddir}"/* "${romdir}" - - printf "%s\n" "${target}" - - microcode_required="y" - . "config/coreboot/${target}/target.cfg" - if [ "${microcode_required}" != "y" ] && \ - [ "${microcode_required}" != "n" ]; then microcode_required="y"; fi - - for x in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \ - CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do - eval "${x}=\"y\"" - grep "${x}=y" "config/coreboot/${target}/config/"* || \ - eval "${x}=\"n\"" - done - - # remove ME/MRC/EC firmware from ROM images - if [ "${CONFIG_HAVE_ME_BIN}" = "y" ] || \ - [ "${target}" = "e6400_4mb" ] || \ - [ "${microcode_required}" = "n" ]; then - strip_archive "${romdir}" - fi - - printf "Generating release/%s/roms/%s-%s_%s.tar.xz\n" \ - "${version}" "${projectname}" "${version}" "${target##*/}" - x_ printf "%s\n" "${version}" > "${romdir}/version" - x_ printf "%s\n" "${versiondate}" > "${romdir}/versiondate" - x_ printf "%s\n" "${projectname}" > "${romdir}/projectname" - - archivename="${projectname}-${version}_${target##*/}" - f="release/${version}/roms/${archivename}" - ( - x_ cd "${romdir%/bin/${target}}" - x_ tar -c "bin/${target}/" | xz -T0 -9e > "${archivename}.tar.xz" - ) - x_ mv "${romdir%/bin/${target}}/${archivename}.tar.xz" "${f}.tar.xz" - x_ rm -Rf "${romdir%/bin/${target}}" -} - -strip_archive() -{ - romdir=${1} - [ -d "coreboot/${tree}" ] || \ - x_ ./update project trees coreboot ${tree} - - x_ ./build coreboot utils ${tree} - - if [ "${microcode_required}" = "n" ]; then - for romfile in "${romdir}"/*.rom; do - [ -f "${romfile}" ] || continue - strip_ucode "${romfile}" - done - for romfile in "${romdir}"/*.tmprom; do - [ -f "${romfile}" ] || continue - x_ mv "${romfile}" "${romfile%.tmprom}.rom" - done - fi - - # Hash the rom before removing blobs - x_ rm -f "${romdir}/blobhashes" - x_ touch "${romdir}/blobhashes" - ( - x_ cd "${romdir}" - x_ sha512sum *.rom >> blobhashes - ) - for romfile in "${romdir}"/*.rom; do - [ -f "${romfile}" ] || continue - strip_rom_image "${romfile}" - done -} - -strip_ucode() -{ - romfile=${1} - _newrom_b="${romfile%.rom}_nomicrocode.tmprom" - x_ cp "${romfile}" "${_newrom_b}" - microcode_present="y" - "${cbfstool}" "${_newrom_b}" remove -n \ - cpu_microcode_blob.bin 2>/dev/null || microcode_present="n" - [ "${microcode_present}" = "n" ] || return 0 - printf "REMARK: '%s' already lacks microcode\n" "${romfile}" 1>&2 - printf "Renaming default ROM file instead.\n" 1>&2 - x_ mv "${romfile}" "${_newrom_b}" -} - -strip_rom_image() -{ - [ -f "${1}" ] || return 0 - [ "${CONFIG_HAVE_ME_BIN}" != "y" ] || \ - x_ "${ifdtool}" --nuke me "${1}" -O "${1}" - [ "${CONFIG_HAVE_MRC}" != "y" ] || \ - x_ "${cbfstool}" "${1}" remove -n mrc.bin - [ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" != "y" ] || \ - x_ "${cbfstool}" "${1}" remove -n sch5545_ecfw.bin - if [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ]; then - x_ "${cbfstool}" "${1}" remove -n ecfw1.bin - x_ "${cbfstool}" "${1}" remove -n ecfw2.bin - fi - # TODO: replace this board-specific hack - [ "${target}" = "e6400_4mb" ] || return 0 - x_ "${cbfstool}" "${1}" remove -n "pci10de,06eb.rom" -} - -main $@ diff --git a/script/build/release/src b/script/build/release/src deleted file mode 100755 index 3a966015..00000000 --- a/script/build/release/src +++ /dev/null @@ -1,128 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2020,2021,2023 Leah Rowe - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -. "include/err.sh" - -read projectname < projectname - -trees_fetch_list="coreboot u-boot seabios" -simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool" -simple_fetch_list="${simple_fetch_list} bios_extract biosutilities" -download_only_list="pico-serprog stm32-vserprog" - -dirlist="config util script include util-fw" -linklist="build update handle" # symlinks in main directory, to script: lbmk -filelist="lbmk README.md COPYING version versiondate projectname" - -version="version-unknown" -versiondate="version-date-unknown" -eval "$(setvars "" reldir dirname srcdir)" - -printf "Building source code archive, version %s\n" "${version}" - -main() -{ - [ -f version ] && read version < version - [ -f versiondate ] && read versiondate < versiondate - - create_release_directory - download_modules - copy_files - purge_files - - create_release_archive - printf "Source code archive available at %s.tar.xz\n\n" "${srcdir}" -} - -create_release_directory() -{ - reldir="release/${version}" - dirname="${projectname}-${version}_src" - srcdir="${reldir}/${dirname}" - - [ -d "release/" ] || x_ mkdir -p release/ - [ -d "${reldir}/" ] || x_ mkdir -p "${reldir}/" - [ ! -d "${srcdir}/" ] || x_ rm -Rf "${srcdir}/" - [ ! -f "${srcdir}.tar.xz" ] || \ - x_ rm -f "${srcdir}.tar.xz/" - - x_ mkdir -p "${srcdir}/" - x_ printf "%s" "${version}" > "${srcdir}"/version -} - -download_modules() -{ - for modname in ${trees_fetch_list}; do - [ -d "${modname}" ] || x_ ./update project trees ${modname} - done - for modname in ${simple_fetch_list} ${download_only_list}; do - [ -d "${modname}/" ] || x_ ./update project repo ${modname} - done -} - -copy_files() -{ - for dir in ${trees_fetch_list}; do - [ -d "${dir}" ] || continue - for subdir in "${dir}"/*; do - [ -d "${subdir}" ] || continue - [ "${subdir##*/}" = "${dir}" ] && continue - x_ mkdir -p "${srcdir}/${dir}" - [ ! -d "${srcdir}/${dir}/${subdir##*/}" ] || \ - x_ rm -Rf "${srcdir}/${dir}/${subdir##*/}" - x_ cp -R "${subdir}" "${srcdir}/${dir}/${subdir##*/}" - done - done - for dir in ${simple_fetch_list} ${dirlist}; do - x_ cp -R "${dir}/" "${srcdir}/" - done - - for i in ${filelist}; do - if [ ! -f "${i}" ]; then - x_ rm -Rf "${srcdir}" - err "copy_files: file '${i}' does not exist" - fi - x_ cp "${i}" "${srcdir}/" - done - ( - x_ cd "${srcdir}/" - for i in ${linklist}; do - x_ ln -s lbmk "${i}" - done - ) -} - -purge_files() -{ - ( - x_ cd "${srcdir}/" - [ ! -d "coreboot/default/util/kbc1126" ] || \ - x_ ./update project build -c "coreboot/default/util/kbc1126" - x_ ./update project build -x coreboot - for p in u-boot seabios coreboot; do - x_ ./update project build -c "${p}" - done - x_ ./update project build -c bios_extract flashrom grub uefitool \ - util-fw/stm32-vserprog util-fw/stm32-vserprog/libopencm3 \ - memtest86plus/build32 memtest86plus/build64 util/* - - x_ rm -Rf .git* */.git* */*/.git* */*/*/.git* */*/*/*/.git* \ - */*/*/*/*/.git* */*/*/*/*/*/.git* */*/*/*/*/*/*/.git* - x_ rm -Rf cbutils elf util-fw/rp2040/pico-serprog/build - ) -} - -create_release_archive() -{ - ( - x_ cd "${reldir}/" - x_ tar -c "${dirname}/" | xz -T0 -9e >"${dirname}.tar.xz" - x_ rm -Rf "${dirname}/" - ) -} - -main $@ diff --git a/script/update/release/roms b/script/update/release/roms new file mode 100755 index 00000000..3cf5d93e --- /dev/null +++ b/script/update/release/roms @@ -0,0 +1,168 @@ +#!/usr/bin/env sh +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2020,2021,2022,2023 Leah Rowe + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +. "include/err.sh" + +read projectname < projectname +version="version-unknown" +versiondate="version-date-unknown" +tree="default" +eval "$(setvars "" target CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ + CONFIG_KBC1126_FIRMWARE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW)" +ifdtool="cbutils/${tree}/ifdtool" +cbfstool="cbutils/${tree}/cbfstool" +microcode_required="y" + +main() +{ + printf "Building ROM image archives for version %s\n" "${version}" + + init_check + for romdir in bin/*; do + [ -d "${romdir}" ] || continue + make_archive "${romdir}" + done + printf "\nROM archives available at release/%s/roms/\n\n" "${version}" +} + +init_check() +{ + [ -f version ] && read version < version + [ -f versiondate ] && read versiondate < versiondate + [ ! -d "bin/" ] && \ + err "init_check: no ROMs built yet (error)" + [ -d "release/" ] || \ + x_ mkdir -p release/ + [ -d "release/${version}/" ] || \ + x_ mkdir -p "release/${version}/" + [ ! -d "release/${version}/roms/" ] || \ + x_ rm -Rf "release/${version}/roms/" + [ -d "release/${version}/roms/" ] && return 0 + x_ mkdir -p "release/${version}/roms/" +} + +make_archive() +{ + builddir="${1}" + romdir="tmp/romdir" + x_ rm -Rf "${romdir}" + target="${builddir##*/}" + + if [ ! -f "config/coreboot/${target}/target.cfg" ]; then + # No config, just make a tarball + tarball=release/${version}/roms/${target}_${version}.tar.xz + x_ tar -c "${builddir}" | xz -T0 -6 > ${tarball} || \ + x_ rm -f ${tarball} + return 0 + fi + + romdir="${romdir}/bin/${target}" + x_ mkdir -p "${romdir}" + x_ cp "${builddir}"/* "${romdir}" + + printf "%s\n" "${target}" + + microcode_required="y" + . "config/coreboot/${target}/target.cfg" + if [ "${microcode_required}" != "y" ] && \ + [ "${microcode_required}" != "n" ]; then microcode_required="y"; fi + + for x in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \ + CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do + eval "${x}=\"y\"" + grep "${x}=y" "config/coreboot/${target}/config/"* || \ + eval "${x}=\"n\"" + done + + # remove ME/MRC/EC firmware from ROM images + if [ "${CONFIG_HAVE_ME_BIN}" = "y" ] || \ + [ "${target}" = "e6400_4mb" ] || \ + [ "${microcode_required}" = "n" ]; then + strip_archive "${romdir}" + fi + + printf "Generating release/%s/roms/%s-%s_%s.tar.xz\n" \ + "${version}" "${projectname}" "${version}" "${target##*/}" + x_ printf "%s\n" "${version}" > "${romdir}/version" + x_ printf "%s\n" "${versiondate}" > "${romdir}/versiondate" + x_ printf "%s\n" "${projectname}" > "${romdir}/projectname" + + archivename="${projectname}-${version}_${target##*/}" + f="release/${version}/roms/${archivename}" + ( + x_ cd "${romdir%/bin/${target}}" + x_ tar -c "bin/${target}/" | xz -T0 -9e > "${archivename}.tar.xz" + ) + x_ mv "${romdir%/bin/${target}}/${archivename}.tar.xz" "${f}.tar.xz" + x_ rm -Rf "${romdir%/bin/${target}}" +} + +strip_archive() +{ + romdir=${1} + [ -d "coreboot/${tree}" ] || \ + x_ ./update project trees coreboot ${tree} + + x_ ./build coreboot utils ${tree} + + if [ "${microcode_required}" = "n" ]; then + for romfile in "${romdir}"/*.rom; do + [ -f "${romfile}" ] || continue + strip_ucode "${romfile}" + done + for romfile in "${romdir}"/*.tmprom; do + [ -f "${romfile}" ] || continue + x_ mv "${romfile}" "${romfile%.tmprom}.rom" + done + fi + + # Hash the rom before removing blobs + x_ rm -f "${romdir}/blobhashes" + x_ touch "${romdir}/blobhashes" + ( + x_ cd "${romdir}" + x_ sha512sum *.rom >> blobhashes + ) + for romfile in "${romdir}"/*.rom; do + [ -f "${romfile}" ] || continue + strip_rom_image "${romfile}" + done +} + +strip_ucode() +{ + romfile=${1} + _newrom_b="${romfile%.rom}_nomicrocode.tmprom" + x_ cp "${romfile}" "${_newrom_b}" + microcode_present="y" + "${cbfstool}" "${_newrom_b}" remove -n \ + cpu_microcode_blob.bin 2>/dev/null || microcode_present="n" + [ "${microcode_present}" = "n" ] || return 0 + printf "REMARK: '%s' already lacks microcode\n" "${romfile}" 1>&2 + printf "Renaming default ROM file instead.\n" 1>&2 + x_ mv "${romfile}" "${_newrom_b}" +} + +strip_rom_image() +{ + [ -f "${1}" ] || return 0 + [ "${CONFIG_HAVE_ME_BIN}" != "y" ] || \ + x_ "${ifdtool}" --nuke me "${1}" -O "${1}" + [ "${CONFIG_HAVE_MRC}" != "y" ] || \ + x_ "${cbfstool}" "${1}" remove -n mrc.bin + [ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" != "y" ] || \ + x_ "${cbfstool}" "${1}" remove -n sch5545_ecfw.bin + if [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ]; then + x_ "${cbfstool}" "${1}" remove -n ecfw1.bin + x_ "${cbfstool}" "${1}" remove -n ecfw2.bin + fi + # TODO: replace this board-specific hack + [ "${target}" = "e6400_4mb" ] || return 0 + x_ "${cbfstool}" "${1}" remove -n "pci10de,06eb.rom" +} + +main $@ diff --git a/script/update/release/src b/script/update/release/src new file mode 100755 index 00000000..3a966015 --- /dev/null +++ b/script/update/release/src @@ -0,0 +1,128 @@ +#!/usr/bin/env sh +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2020,2021,2023 Leah Rowe + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +. "include/err.sh" + +read projectname < projectname + +trees_fetch_list="coreboot u-boot seabios" +simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool" +simple_fetch_list="${simple_fetch_list} bios_extract biosutilities" +download_only_list="pico-serprog stm32-vserprog" + +dirlist="config util script include util-fw" +linklist="build update handle" # symlinks in main directory, to script: lbmk +filelist="lbmk README.md COPYING version versiondate projectname" + +version="version-unknown" +versiondate="version-date-unknown" +eval "$(setvars "" reldir dirname srcdir)" + +printf "Building source code archive, version %s\n" "${version}" + +main() +{ + [ -f version ] && read version < version + [ -f versiondate ] && read versiondate < versiondate + + create_release_directory + download_modules + copy_files + purge_files + + create_release_archive + printf "Source code archive available at %s.tar.xz\n\n" "${srcdir}" +} + +create_release_directory() +{ + reldir="release/${version}" + dirname="${projectname}-${version}_src" + srcdir="${reldir}/${dirname}" + + [ -d "release/" ] || x_ mkdir -p release/ + [ -d "${reldir}/" ] || x_ mkdir -p "${reldir}/" + [ ! -d "${srcdir}/" ] || x_ rm -Rf "${srcdir}/" + [ ! -f "${srcdir}.tar.xz" ] || \ + x_ rm -f "${srcdir}.tar.xz/" + + x_ mkdir -p "${srcdir}/" + x_ printf "%s" "${version}" > "${srcdir}"/version +} + +download_modules() +{ + for modname in ${trees_fetch_list}; do + [ -d "${modname}" ] || x_ ./update project trees ${modname} + done + for modname in ${simple_fetch_list} ${download_only_list}; do + [ -d "${modname}/" ] || x_ ./update project repo ${modname} + done +} + +copy_files() +{ + for dir in ${trees_fetch_list}; do + [ -d "${dir}" ] || continue + for subdir in "${dir}"/*; do + [ -d "${subdir}" ] || continue + [ "${subdir##*/}" = "${dir}" ] && continue + x_ mkdir -p "${srcdir}/${dir}" + [ ! -d "${srcdir}/${dir}/${subdir##*/}" ] || \ + x_ rm -Rf "${srcdir}/${dir}/${subdir##*/}" + x_ cp -R "${subdir}" "${srcdir}/${dir}/${subdir##*/}" + done + done + for dir in ${simple_fetch_list} ${dirlist}; do + x_ cp -R "${dir}/" "${srcdir}/" + done + + for i in ${filelist}; do + if [ ! -f "${i}" ]; then + x_ rm -Rf "${srcdir}" + err "copy_files: file '${i}' does not exist" + fi + x_ cp "${i}" "${srcdir}/" + done + ( + x_ cd "${srcdir}/" + for i in ${linklist}; do + x_ ln -s lbmk "${i}" + done + ) +} + +purge_files() +{ + ( + x_ cd "${srcdir}/" + [ ! -d "coreboot/default/util/kbc1126" ] || \ + x_ ./update project build -c "coreboot/default/util/kbc1126" + x_ ./update project build -x coreboot + for p in u-boot seabios coreboot; do + x_ ./update project build -c "${p}" + done + x_ ./update project build -c bios_extract flashrom grub uefitool \ + util-fw/stm32-vserprog util-fw/stm32-vserprog/libopencm3 \ + memtest86plus/build32 memtest86plus/build64 util/* + + x_ rm -Rf .git* */.git* */*/.git* */*/*/.git* */*/*/*/.git* \ + */*/*/*/*/.git* */*/*/*/*/*/.git* */*/*/*/*/*/*/.git* + x_ rm -Rf cbutils elf util-fw/rp2040/pico-serprog/build + ) +} + +create_release_archive() +{ + ( + x_ cd "${reldir}/" + x_ tar -c "${dirname}/" | xz -T0 -9e >"${dirname}.tar.xz" + x_ rm -Rf "${dirname}/" + ) +} + +main $@ -- cgit v1.2.1