move rom tarball creation to script/roms
export CBMK_RELEASE="y" if this is done, the tarball is created instead of a directory, and the rom images are nuked using ./vendor inject with the nuke option, inserting the correct version files; the rom directory is deleted now the release script logic simple renames existing tarballs. the benefit of this change is fewer lines of code, and now cbmk doesn't use an insane amount of disk space when building a *lot* of release images (the uncompressed directories are deleted after each build) Signed-off-by: Leah Rowe <leah@libreboot.org>audit2-merge1
Leah Rowe
Leah Rowe
parent
5c888669c6
commit
09fcc343a3
100
build
100
build
|
|
@ -216,107 +216,15 @@ mkrom_images()
|
|||
./build roms serprog rp2040 || $err "${_xm}: rp2040"
|
||||
./build roms serprog stm32 || $err "${_xm}: stm32"
|
||||
|
||||
for rombuild in bin/*; do
|
||||
[ -d "${rombuild}" ] || continue
|
||||
handle_rom_archive "${rombuild}"
|
||||
for rombuild in bin/*.tar.xz; do
|
||||
[ -f "${rombuild}" ] || continue
|
||||
tarball="release/$version/roms/${relname}_${rombuild##*/}"
|
||||
mv "$rombuild" "$tarball" || $err "Cannot create $tarball"
|
||||
done
|
||||
|
||||
mv "release/${version}/roms/" ../roms || $err "${_xm}: copy roms/"
|
||||
}
|
||||
|
||||
handle_rom_archive()
|
||||
{
|
||||
builddir="${1}"
|
||||
romdir="tmp/romdir"
|
||||
rm -Rf "${romdir}" || $err "!rm romdir, handle_rom_archive"
|
||||
target="${builddir##*/}"
|
||||
|
||||
if [ ! -f "config/coreboot/${target}/target.cfg" ]; then
|
||||
# No config, just make a tarball
|
||||
tarball="release/${version}/roms/${relname}_${target}.tar.xz"
|
||||
insert_copying_files "${builddir}" || \
|
||||
$err "!insert copy, handle, ${builddir}"
|
||||
mktarball "${builddir}" "${tarball}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
romdir="${romdir}/bin/${target}"
|
||||
mkdir -p "${romdir}" || $err "!mkdir -p romdir, handle_rom_archive"
|
||||
cp "$builddir/"* "$romdir" || $err "!cp romdir, handle_rom_archive"
|
||||
|
||||
printf "Generating release/%s/roms/%s-%s_%s.tar.xz\n" \
|
||||
"${version}" "${projectname}" "${version}" "${target##*/}"
|
||||
insert_version_files "${romdir}" || \
|
||||
$err "mkrom_tarball ${romdir}: versionfile"
|
||||
|
||||
insert_copying_files "$romdir" || $err "!insert copy, handle 2, $romdir"
|
||||
mkrom_tarball
|
||||
}
|
||||
|
||||
insert_copying_files()
|
||||
{
|
||||
remkdir "${1}/licenses"
|
||||
l="${1}/licenses"
|
||||
# copy licenses to rom image archive, for completion
|
||||
cp "src/grub/COPYING" "${l}/COPYING.grub" || return 1
|
||||
cp "src/coreboot/default/COPYING" "${l}/COPYING.coreboot" || return 1
|
||||
cp -R "src/coreboot/default/LICENSES" "${l}/LICENSES.coreboot" || \
|
||||
return 1
|
||||
cp "src/seabios/default/COPYING" "${l}/COPYING.coreboot" || return 1
|
||||
cp "src/seabios/default/COPYING.LESSER" "$l/COPYING.LESSER.seabios" \
|
||||
|| return 1
|
||||
cp -R "src/u-boot/default/Licenses" "${l}/COPYING.u-boot" || return 1
|
||||
printf "Multiple licenses. Check corresponding %s source archive\n" \
|
||||
"${projectname}" > "${1}/COPYING" || return 1
|
||||
rm -f src/u-boot/*/test/lib/strlcat.c || return 1
|
||||
}
|
||||
|
||||
mkrom_tarball()
|
||||
{
|
||||
archivename="${relname}_${target##*/}"
|
||||
f="release/${version}/roms/${archivename}"
|
||||
mkdir -p "${f%/*}" || $err "mkrom_tarball: !mkdir -p ${f%/*}"
|
||||
(
|
||||
cd "${romdir%"/bin/$target"}" || $err "!cd ${romdir%"/bin/$target"}"
|
||||
mktarball "bin/${target}" "${archivename}.tar.xz"
|
||||
) || $err "can't create rom tarball"
|
||||
mv "${romdir%"/bin/${target}"}/${archivename}.tar.xz"* "${f%/*}" || \
|
||||
$err "mktar ${f%/*}/${romdir%"/bin/$target"}/$archivename.tar.xz"
|
||||
|
||||
printf "Created ROM archive: %s" "${f%/*}/${archivename}.tar.xz"
|
||||
}
|
||||
|
||||
insert_version_files()
|
||||
{
|
||||
printf "%s\n" "${version}" > "${1}/version" || return 1
|
||||
printf "%s\n" "${versiondate}" > "${1}/versiondate" || return 1
|
||||
printf "%s\n" "${projectname}" > "${1}/projectname" || return 1
|
||||
}
|
||||
|
||||
mktarball()
|
||||
{
|
||||
# preserve timestamps for reproducible tarballs
|
||||
tar_implementation=$(tar --version | head -n1) || :
|
||||
|
||||
[ "${2%/*}" = "${2}" ] || \
|
||||
mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\""
|
||||
printf "\nCreating archive: %s\n\n" "$2"
|
||||
if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then
|
||||
tar --sort=name --owner=root:0 --group=root:0 \
|
||||
--mtime="UTC 2024-05-04" -c "$1" | xz -T$threads -9e \
|
||||
> "$2" || $err "mktarball 1, ${1}"
|
||||
else
|
||||
# TODO: reproducible tarballs on non-GNU systems
|
||||
tar -c "$1" | xz -T$threads -9e > "$2" || \
|
||||
$err "mktarball 2, $1"
|
||||
fi
|
||||
(
|
||||
[ "${2%/*}" != "${2}" ] && x_ cd "${2%/*}"
|
||||
sha512sum "${2##*/}" > "${2##*/}.sha512" || \
|
||||
$err "!sha512sum \"${2##*/}\" > \"${2##*/}.sha512\""
|
||||
) || $err "failed to create tarball checksum"
|
||||
}
|
||||
|
||||
mkversion()
|
||||
{
|
||||
printf "revision: %s %s\n" "$projectname" "$version"
|
||||
|
|
|
|||
|
|
@ -164,3 +164,41 @@ check_project()
|
|||
done
|
||||
export LOCALVERSION="-${projectname}-${version%%-*}"
|
||||
}
|
||||
|
||||
mktar_release()
|
||||
{
|
||||
x_ insert_version_files "$1"
|
||||
mktarball "$1" "${1}.tar.xz"
|
||||
x_ rm -Rf "$1"
|
||||
}
|
||||
|
||||
mktarball()
|
||||
{
|
||||
# preserve timestamps for reproducible tarballs
|
||||
tar_implementation=$(tar --version | head -n1) || :
|
||||
|
||||
[ "${2%/*}" = "${2}" ] || \
|
||||
mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\""
|
||||
printf "\nCreating archive: %s\n\n" "$2"
|
||||
if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then
|
||||
tar --sort=name --owner=root:0 --group=root:0 \
|
||||
--mtime="UTC 2024-05-04" -c "$1" | xz -T$threads -9e \
|
||||
> "$2" || $err "mktarball 1, ${1}"
|
||||
else
|
||||
# TODO: reproducible tarballs on non-GNU systems
|
||||
tar -c "$1" | xz -T$threads -9e > "$2" || \
|
||||
$err "mktarball 2, $1"
|
||||
fi
|
||||
(
|
||||
[ "${2%/*}" != "${2}" ] && x_ cd "${2%/*}"
|
||||
sha512sum "${2##*/}" > "${2##*/}.sha512" || \
|
||||
$err "!sha512sum \"${2##*/}\" > \"${2##*/}.sha512\""
|
||||
) || $err "failed to create tarball checksum"
|
||||
}
|
||||
|
||||
insert_version_files()
|
||||
{
|
||||
printf "%s\n" "${version}" > "${1}/version" || return 1
|
||||
printf "%s\n" "${versiondate}" > "${1}/versiondate" || return 1
|
||||
printf "%s\n" "${projectname}" > "${1}/projectname" || return 1
|
||||
}
|
||||
|
|
|
|||
22
script/roms
22
script/roms
|
|
@ -66,11 +66,16 @@ main()
|
|||
done
|
||||
fi
|
||||
|
||||
[ -z "${targets}" ] && $err "No ROM images were compiled"
|
||||
printf "\nROM images available in these directories:\n"
|
||||
eval "printf \"${targets}\""
|
||||
printf "^^ ROM images available in these directories.\n\n"
|
||||
bstr="directories"
|
||||
[ "$cbmk_release" = "y" ] && bstr="tarballs"
|
||||
|
||||
[ -z "${targets}" ] && $err "No ROM images were compiled"
|
||||
printf "\nROM images available in these %s:\n" "$bstr"
|
||||
eval "printf \"${targets}\""
|
||||
printf "^^ ROM images available in these %s.\n\n" "$bstr"
|
||||
|
||||
[ "$cbmk_release" = "y" ] && \
|
||||
printf "Always run the inject command on release images!\n"
|
||||
printf "DO NOT flash images from elf/ - please use bin/ instead.\n"
|
||||
}
|
||||
|
||||
|
|
@ -89,6 +94,7 @@ handle_serprog()
|
|||
|
||||
if [ $# -gt 1 ] && [ "${2}" = "list" ]; then
|
||||
print_serprog_boards ${serprog_boards_dir}
|
||||
return 0
|
||||
elif [ $# -gt 1 ]; then
|
||||
build_${1}_rom "${2}"
|
||||
else
|
||||
|
|
@ -98,6 +104,8 @@ handle_serprog()
|
|||
build_${1}_rom "${board}"
|
||||
done
|
||||
fi
|
||||
|
||||
[ "$cbmk_release" = "y" ] && mktar_release "bin/serprog_$1"; return 0
|
||||
}
|
||||
|
||||
build_rp2040_rom()
|
||||
|
|
@ -151,7 +159,9 @@ handle_coreboot_target()
|
|||
build_target_mainboard
|
||||
|
||||
[ -d "bin/${board}" ] || return 0
|
||||
targets="* bin/${board}\n${targets}"
|
||||
[ "$cbmk_release" = "y" ] || targets="* bin/${board}\n${targets}"
|
||||
[ "$cbmk_release" = "y" ] && targets="* bin/$board.tar.xz\n$targets"
|
||||
[ "$cbmk_release" = "y" ] && mktar_release "bin/$board"; return 0
|
||||
}
|
||||
|
||||
configure_target()
|
||||
|
|
@ -264,7 +274,7 @@ build_uboot_payload()
|
|||
|
||||
build_target_mainboard()
|
||||
{
|
||||
rm -f "${romdir}/"* || $err "!prepare, rm files, ${romdir}"
|
||||
x_ rm -Rf "${romdir}"
|
||||
|
||||
for x in "normal" "vgarom" "libgfxinit"; do
|
||||
initmode="${x}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue