Skip to content

Commit 331f472

Browse files
bart0shbart0sh
authored
Merge pull request #701 from hj-johannes-lee/chksum_toybox
Add checksum checks for toybox and qat driver
2 parents 48d7896 + b908129 commit 331f472

File tree

6 files changed

+35
-10
lines changed

6 files changed

+35
-10
lines changed

‎build/docker/intel-fpga-initcontainer.Dockerfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,13 @@ RUN echo "{\n\
5050
\"annotation\": [ \"fpga.intel.com/region\" ]\n\
5151
}\n">>$ROOT/$SRC_DIR/$CRI_HOOK.json
5252

53-
ARG TOYBOX_VERSION="0.8.4"
53+
ARG TOYBOX_VERSION="0.8.5"
54+
ARG TOYBOX_SHA256="27cc073222f3b726ee10d96c4f32ac2c4c936b07ea195227736755971e6d90c9"
5455
RUN apt update && apt -y install musl musl-tools musl-dev
55-
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz | tar xz \
56+
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz -o toybox.tar.gz \
57+
&& echo "$TOYBOX_SHA256 toybox.tar.gz" | sha256sum -c - \
58+
&& tar -xzf toybox.tar.gz \
59+
&& rm toybox.tar.gz \
5660
&& cd toybox-$TOYBOX_VERSION \
5761
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
5862
&& install -D LICENSE $ROOT/usr/local/share/package-licenses/toybox \

‎build/docker/intel-gpu-initcontainer.Dockerfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,14 @@ ARG SRC_DIR=/usr/local/bin/gpu-sw
4141

4242
RUN install -D /go/bin/gpu_nfdhook $ROOT/$SRC_DIR/$NFD_HOOK
4343

44-
ARG TOYBOX_VERSION="0.8.4"
44+
ARG TOYBOX_VERSION="0.8.5"
45+
ARG TOYBOX_SHA256="27cc073222f3b726ee10d96c4f32ac2c4c936b07ea195227736755971e6d90c9"
46+
4547
RUN apt update && apt -y install musl musl-tools musl-dev
46-
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz | tar xz \
48+
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz -o toybox.tar.gz \
49+
&& echo "$TOYBOX_SHA256 toybox.tar.gz" | sha256sum -c - \
50+
&& tar -xzf toybox.tar.gz \
51+
&& rm toybox.tar.gz \
4752
&& cd toybox-$TOYBOX_VERSION \
4853
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
4954
&& install -D LICENSE $ROOT/usr/local/share/package-licenses/toybox \

‎build/docker/intel-qat-plugin-kerneldrv.Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ WORKDIR $DIR
2929
COPY . .
3030

3131
ARG QAT_DRIVER_RELEASE="qat1.7.l.4.14.0-00031"
32+
ARG QAT_DRIVER_SHA256="a68dfaea4308e0bb5f350b7528f1a076a0c6ba3ec577d60d99dc42c49307b76e"
3233

3334
RUN mkdir -p /usr/src/qat \
3435
&& cd /usr/src/qat \
35-
&& wget https://downloadmirror.intel.com/30178/eng/${QAT_DRIVER_RELEASE}.tar.gz \
36+
&& wget https://downloadmirror.intel.com/30178/eng/$QAT_DRIVER_RELEASE.tar.gz \
37+
&& echo "$QAT_DRIVER_SHA256 $QAT_DRIVER_RELEASE.tar.gz" | sha256sum -c - \
3638
&& tar xf *.tar.gz \
3739
&& cd /usr/src/qat/quickassist/utilities/adf_ctl \
3840
&& make KERNEL_SOURCE_DIR=/usr/src/qat/quickassist/qat \

‎build/docker/intel-sgx-initcontainer.Dockerfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,14 @@ ARG SRC_DIR=/usr/local/bin/sgx-sw
4141

4242
RUN install -D /go/bin/sgx_epchook $ROOT/$SRC_DIR/$NFD_HOOK
4343

44-
ARG TOYBOX_VERSION="0.8.4"
44+
ARG TOYBOX_VERSION="0.8.5"
45+
ARG TOYBOX_SHA256="27cc073222f3b726ee10d96c4f32ac2c4c936b07ea195227736755971e6d90c9"
46+
4547
RUN apt update && apt -y install musl musl-tools musl-dev
46-
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz | tar xz \
48+
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz -o toybox.tar.gz \
49+
&& echo "$TOYBOX_SHA256 toybox.tar.gz" | sha256sum -c - \
50+
&& tar -xzf toybox.tar.gz \
51+
&& rm toybox.tar.gz \
4752
&& cd toybox-$TOYBOX_VERSION \
4853
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
4954
&& install -D LICENSE $ROOT/usr/local/share/package-licenses/toybox \

‎build/docker/toybox-config‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
33
# ToyBox version: KCONFIG_VERSION
4-
# Sat May 15 08:23:52 2021
4+
# Tue Sep 14 22:53:41 2021
55
#
66
CONFIG_TOYBOX_CONTAINER=y
77
CONFIG_TOYBOX_FIFREEZE=y
@@ -92,6 +92,7 @@ CONFIG_LS=y
9292
# CONFIG_TAR is not set
9393
# CONFIG_TEE is not set
9494
# CONFIG_TEST is not set
95+
# CONFIG_TEST_GLUE is not set
9596
# CONFIG_TIME is not set
9697
# CONFIG_TOUCH is not set
9798
# CONFIG_TRUE is not set
@@ -115,6 +116,7 @@ CONFIG_LS=y
115116
# CONFIG_BC is not set
116117
# CONFIG_BOOTCHARTD is not set
117118
# CONFIG_BRCTL is not set
119+
# CONFIG_CHSH is not set
118120
# CONFIG_CROND is not set
119121
# CONFIG_CRONTAB is not set
120122
# CONFIG_DD is not set
@@ -154,18 +156,20 @@ CONFIG_LS=y
154156
# CONFIG_MORE is not set
155157
# CONFIG_OPENVT is not set
156158
# CONFIG_DEALLOCVT is not set
157-
# CONFIG_READELF is not set
158159
# CONFIG_ROUTE is not set
159160
CONFIG_SH=y
160161
# CONFIG_CD is not set
161162
# CONFIG_EXIT is not set
163+
# CONFIG_SET is not set
162164
# CONFIG_UNSET is not set
163165
# CONFIG_EVAL is not set
164166
# CONFIG_EXEC is not set
165167
# CONFIG_EXPORT is not set
166168
# CONFIG_JOBS is not set
169+
# CONFIG_LOCAL is not set
167170
# CONFIG_SHIFT is not set
168171
# CONFIG_SOURCE is not set
172+
# CONFIG_WAIT is not set
169173
# CONFIG_STTY is not set
170174
# CONFIG_SULOGIN is not set
171175
# CONFIG_SYSLOGD is not set
@@ -187,7 +191,9 @@ CONFIG_SH=y
187191
#
188192
# CONFIG_ACPI is not set
189193
# CONFIG_ASCII is not set
194+
# CONFIG_UNICODE is not set
190195
# CONFIG_BASE64 is not set
196+
# CONFIG_BASE32 is not set
191197
# CONFIG_BLKDISCARD is not set
192198
# CONFIG_BLKID is not set
193199
# CONFIG_FSTYPE is not set
@@ -247,7 +253,9 @@ CONFIG_SH=y
247253
# CONFIG_PMAP is not set
248254
# CONFIG_PRINTENV is not set
249255
# CONFIG_PWDX is not set
256+
# CONFIG_PWGEN is not set
250257
# CONFIG_READAHEAD is not set
258+
# CONFIG_READELF is not set
251259
# CONFIG_READLINK is not set
252260
# CONFIG_REALPATH is not set
253261
# CONFIG_REBOOT is not set
@@ -365,7 +373,6 @@ CONFIG_TOYBOX_LSM_NONE=y
365373
# CONFIG_TOYBOX_FLOAT is not set
366374
# CONFIG_TOYBOX_HELP is not set
367375
# CONFIG_TOYBOX_HELP_DASHDASH is not set
368-
# CONFIG_TOYBOX_I18N is not set
369376
# CONFIG_TOYBOX_FREE is not set
370377
# CONFIG_TOYBOX_NORECURSE is not set
371378
# CONFIG_TOYBOX_DEBUG is not set

‎demo/openssl-qat-engine/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ARG FINAL_BASE_IMAGE=clearlinux:base
33
FROM clearlinux:base as builder
44

55
ARG QAT_DRIVER_RELEASE="qat1.7.l.4.14.0-00031"
6+
ARG QAT_DRIVER_SHA256="a68dfaea4308e0bb5f350b7528f1a076a0c6ba3ec577d60d99dc42c49307b76e"
67
ARG QAT_ENGINE_VERSION="v0.6.1"
78
ARG IPSEC_MB_VERSION="v0.55"
89
ARG IPP_CRYPTO_VERSION="ippcp_2020u3"
@@ -12,6 +13,7 @@ RUN swupd bundle-add --skip-diskspace-check devpkg-systemd devpkg-openssl c-basi
1213
git clone -b $IPP_CRYPTO_VERSION https://github.com/intel/ipp-crypto && \
1314
git clone -b $IPSEC_MB_VERSION https://github.com/intel/intel-ipsec-mb && \
1415
wget https://downloadmirror.intel.com/30178/eng/$QAT_DRIVER_RELEASE.tar.gz && \
16+
echo "$QAT_DRIVER_SHA256 $QAT_DRIVER_RELEASE.tar.gz" | sha256sum -c - && \
1517
tar xf *.tar.gz
1618

1719
RUN sed -i -e 's/cmn_ko$//' -e 's/lac_kernel$//' quickassist/Makefile && \

0 commit comments

Comments
 (0)