summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-05-24 12:13:47 +0000
committerChristian Breunig <christian@breunig.cc>2026-06-01 21:10:52 +0200
commit91e0e865ca3730d5ef00f79aa369fa9d41b5baef (patch)
tree12991a8ff7dfe1fd6d735e055200e29413d5e57c /scripts
parent1448a5714e229cc7f5e9dc7dffdac8f4230224a5 (diff)
downloadvyos-build-91e0e865ca3730d5ef00f79aa369fa9d41b5baef.tar.gz
vyos-build-91e0e865ca3730d5ef00f79aa369fa9d41b5baef.zip
Revert "T8542: Add functionality to generate SBOM file from ISO image"
This reverts commit d84d127f91186082df2a786c7e20fe2af55dfa3b.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/check-qemu-install12
1 files changed, 2 insertions, 10 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 0d94af67..ae577faa 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -1306,18 +1306,10 @@ try:
raise Exception('Failed to mount SBOM transfer disk inside VM')
c.expect(op_mode_prompt)
- # Copy the syft binary from the transfer disk and verify it is available before running the SBOM generation process
- c.sendline('test -x /mnt/sbom_transfer/syft && echo SYFT_SRC_OK || echo SYFT_SRC_FAIL')
- i = c.expect(['SYFT_SRC_OK', 'SYFT_SRC_FAIL'])
- if i != 0:
- raise Exception('Syft binary is missing or not executable on the SBOM transfer disk')
+ # Copy the syft binary to the transfer disk and check the version to verify it works before running the SBOM generation process
+ c.sendline('sudo cp /mnt/sbom_transfer/syft /tmp/syft && sudo chmod +x /tmp/syft')
c.expect(op_mode_prompt)
- c.sendline('sudo cp /mnt/sbom_transfer/syft /tmp/syft && sudo chmod +x /tmp/syft && test -x /tmp/syft && echo SYFT_COPY_OK || echo SYFT_COPY_FAIL')
- i = c.expect(['SYFT_COPY_OK', 'SYFT_COPY_FAIL'])
- if i != 0:
- raise Exception('Failed to copy Syft binary from SBOM transfer disk to /tmp/syft')
- c.expect(op_mode_prompt)
c.sendline('TERM=dumb /tmp/syft --version')
c.expect(op_mode_prompt)
lines = c.before.decode(errors='replace').strip().splitlines()