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.

Sign up for GitHub

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

Added vmcap script in the verification image #3542

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Added vmcap script in the verification image #3542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/mkverification-raw-efi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ENV BUILD_PKGS mkinitfs grep patch make coreutils musl-dev gcc g++ perl \
util-linux-dev flex linux-headers glib-dev libxrandr-dev zlib-dev \
libusb-dev kmod-dev curl eudev-dev libdrm-dev i2c-tools-dev hwinfo \
binutils-dev libaio-dev zlib-static libvncserver-dev python3 pixman-dev \
py3-setuptools bash perl cmake m4 pkgconf autoconf-archive tpm2-tss-dev
py3-setuptools bash perl cmake m4 pkgconf autoconf-archive tpm2-tss-dev go
ENV PKGS mtools dosfstools libarchive-tools sgdisk e2fsprogs util-linux \
squashfs-tools coreutils tar dmidecode smartmontools libaio libaio-dev \
perl glib zlib libusb curl xz pciutils usbutils hdparm util-linux \
Expand All @@ -38,7 +38,9 @@ ADD https://github.com/linuxhw/build-stuff/releases/download/1.6/hw-probe-1.6-AI
#ADD https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img /out/ubuntu-22.04-minimal-cloudimg-amd64.img
ADD https://github.com/tpm2-software/tpm2-tools/archive/5.2.tar.gz /out/5.2.tar.gz

COPY make-raw verify grub.cfg.in UsbInvocationScript.txt ./
COPY make-raw verify grub.cfg.in UsbInvocationScript.txt vmcap.go ./

RUN go build vmcap.go && rm vmcap.go

RUN tar -xf hw-probe-1.6-AI.tar.gz \
&& tar -xf ddcutil-1.2.2.tar.gz \
Expand Down
5 changes: 5 additions & 0 deletions pkg/mkverification-raw-efi/verify
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,11 @@ else
echo "No watchdogs available" > "$REPORT/watchdogs.log"
fi

ARCH=$(uname -m)
if [ "$ARCH" = "x86_64" ]; then
/vmcap > "$REPORT/vmcap.log"
fi

cat "$REPORT/summary.log"

if [ -n "$REPORT" ]; then
Expand Down
Loading
Loading