Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules/lvm2: define /run relative paths (not sure why circleci remote docker default run dir != local run dir) #1858

Merged
merged 1 commit into from
Nov 22, 2024

Conversation

tlaurion
Copy link
Collaborator

This fixes #1857

Was artifact of lvm2 version bump that happened under #1541.
TODO: figure out what still bled here to cause discrepancy, will attach diffoscope logs to #1857

…e docker default run dir != local run dir)

Signed-off-by: Thierry Laurion <[email protected]>
@tlaurion
Copy link
Collaborator Author

Local build for output for 1a07bf7 (note that this hash is last part of rom name):

"/home/user/heads/build/x86/coreboot-24.02.01/qemu-coreboot-fbwhiptail-tpm2-hotp/cbfstool" "/home/user/heads/build/x86/coreboot-24.02.01/qemu-coreboot-fbwhiptail-tpm2-hotp/coreboot.rom" print
FMAP REGION: COREBOOT
Name                           Offset     Type           Size   Comp
cbfs_master_header             0x0        cbfs header        32 none
fallback/romstage              0x80       stage           24464 none
fallback/ramstage              0x60c0     stage          105534 LZMA (226780 decompressed)
build_info                     0x1fd80    raw               108 none
bootsplash.jpg                 0x1fe40    bootsplash      43282 none
fallback/dsdt.aml              0x2a780    raw              7175 none
cmos_layout.bin                0x2c3c0    cmos_layout       640 none
fallback/postcar               0x2c680    stage           28380 none
fallback/payload               0x335c0    simple elf   10363968 none
(empty)                        0xa15a40   null          6051812 none
bootblock                      0xfdb240   bootblock       19328 none
2024-11-22 16:45:00+00:00 INSTALL   build/x86/coreboot-24.02.01/qemu-coreboot-fbwhiptail-tpm2-hotp/coreboot.rom => build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom
2a73d1dc92f73fd88d1fca4cccb0d6ce389bca59e5f95198870655764e342756  build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom
16777216:build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom
rm -rf "/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/update_pkg"
mkdir -p "/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/update_pkg"
cp "/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom" "/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/update_pkg/"
cd "/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/update_pkg" && sha256sum "heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom" >sha256sum.txt
cd "/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/update_pkg" && zip -9 "/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.zip" "heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom" sha256sum.txt
 adding: heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom (deflated 37%)
 adding: sha256sum.txt (deflated 17%)
2a73d1dc92f73fd88d1fca4cccb0d6ce389bca59e5f95198870655764e342756  /home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom
16777216:/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/heads-qemu-coreboot-fbwhiptail-tpm2-hotp-v0.2.0-2436-g1a07bf7.rom

hashes.txt comparison with hashes.txt from that board's CircleCI artifacts from https://app.circleci.com/pipelines/github/tlaurion/heads/3001/workflows/5895e0f1-1b7f-4f71-9789-754e12761491/jobs/58103/artifacts:

user@heads-clean2:~/heads$ wget https://output.circle-artifacts.com/output/job/2f4407cb-c8f1-479c-b04e-d829943c4328/artifacts/0/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/hashes.txt -O hashes_1858.txt -q
user@heads-clean2:~/heads$ HASHES1=hashes_1858.txt 
user@heads-clean2:~/heads$ HASHES2=/home/user/heads/build/x86/qemu-coreboot-fbwhiptail-tpm2-hotp/hashes.txt 
user@heads-clean2:~/heads$ egrep '^[0-9a-f]{64}' $HASHES1 | while read line; do HASH_REF=$(echo $line|awk -F " " {'print $1'}); FILE_REF=$(echo $line|awk -F "/" {'print $NF'}); if ! grep -q "$HASH_REF" $HASHES2; then echo "$FILE_REF doesn't match";fi; done

No output =no diff = reproducible.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

lvm is not reproducible on master (be0aac691404b75fcae2a0dec831c48adff17ea2)
1 participant