From 72cd169ee5ddc435a7742d7a05be1f59756a3aae Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 23 Dec 2023 04:41:25 +0000 Subject: [PATCH] update/release: don't test ./vendor inject the purpose of script/update/release is not to test the build system, but to build release archives. testing of lbmk is done during the course of development. remove this bloat from the release script. we run the nuke mode anyway, to scrub blobs from releases, which will more or less test the logic in that script (the only difference is that it runs e.g. ifdtool --nuke instead of -i). Signed-off-by: Leah Rowe --- script/update/release | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/script/update/release b/script/update/release index 1c018360..b9128328 100755 --- a/script/update/release +++ b/script/update/release @@ -61,20 +61,6 @@ build_release() mkrom_images ) || err "can't build rom images" - # 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 - *serprog*) continue ;; - esac - ./vendor inject "${vrom}" || \ - err "TESTFAIL: inject: ${vrom##*/}" - done - ) || err "vendorfile inject test failure" - rm -Rf "${srcdir}" || err "!rm -Rf ${srcdir}" } @@ -98,7 +84,9 @@ fetch_trees() mkrom_images() { - mkfakeroms + x_ 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" ./build roms all || err "${_xm}: roms-all" ./build serprog rp2040 || err "${_xm}: rp2040" @@ -112,15 +100,6 @@ 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}"