diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-11-01 10:34:05 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-11-01 16:36:16 +0000 |
| commit | 1f1498be7421ae4500ad0d6d40ca0eefbcf8f1a2 (patch) | |
| tree | 6dec94c650526e5f2e345a5c15aef94825ff50f0 /script | |
| parent | 82bd87fa160a4f37136ad04a33091b08eb48d829 (diff) | |
Libreboot 2023110120231101
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/update/release | 18 | ||||
| -rwxr-xr-x | script/vendor/inject | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/script/update/release b/script/update/release index 21fa8b61..4febec81 100755 --- a/script/update/release +++ b/script/update/release @@ -95,6 +95,7 @@ build_release() # now test the vendor insert script, using the release archive: ( cd "${srcdir}" || err "!cd ${srcdir}" + mkfakeroms for vrom in ../roms/*.tar.xz; do [ -f "${vrom}" ] || continue case "${vrom}" in @@ -129,11 +130,7 @@ fetch_trees() mkrom_images() { - # fake me.bin to make x201 roms build - mkdir -p "vendorfiles/cache/" || \ - err "mkvdir: !mkdir -p \"vendorfiles/cache/\"" - dd if=/dev/zero of="vendorfiles/cache/x201_factory.rom" \ - bs=68k count=1 || err "mkvdir: can't make fake x201_factory.rom" + mkfakeroms ./build roms all || err "${_xm}: roms-all" ./build serprog rp2040 || err "${_xm}: rp2040" @@ -147,6 +144,15 @@ mkrom_images() mv "release/${version}/roms/" ../roms || err "${_xm}: copy roms/" } +mkfakeroms() +{ + # fake me.bin to make x201 roms build + mkdir -p "vendorfiles/x201/" || \ + err "mkvdir: !mkdir -p \"vendorfiles/x201/\"" + dd if=/dev/zero of="vendorfiles/x201/me.bin" \ + bs=68k count=1 || err "mkvdir: can't make fake x201 me.bin" +} + handle_rom_archive() { builddir="${1}" @@ -272,7 +278,7 @@ mktarball() [ "${2%/*}" = "${2}" ] || mkdir -p "${2%/*}" || err "mk, !mkdir -p \"${2%/*}\"" if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then tar --sort=name --owner=root:0 --group=root:0 \ - --mtime="UTC 2023-10-21" -c "${1}" | xz -T0 -9e > "${2}" || \ + --mtime="UTC 2023-11-01" -c "${1}" | xz -T0 -9e > "${2}" || \ err "mktarball 1, ${1}" else # TODO: reproducible tarballs on non-GNU systems diff --git a/script/vendor/inject b/script/vendor/inject index db8004e4..93017cec 100755 --- a/script/vendor/inject +++ b/script/vendor/inject @@ -39,7 +39,9 @@ main() check_board() { - if ! check_release "${archive}" ; then + failcheck="n" + check_release "${archive}" || failcheck="y" + if [ "${failcheck}" = "y" ]; then [ -f "${rom}" ] || \ err "check_board: \"${rom}\" is not a valid path" [ -z "${rom+x}" ] && \ |