Skip to content

Commit 8a73008

Browse files
committed
images: update to toybox 0.8.7
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
1 parent 4804ec4 commit 8a73008

File tree

6 files changed

+34
-33
lines changed

6 files changed

+34
-33
lines changed

build/docker/intel-fpga-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ RUN echo "{\n\
7272
\"stage\" : [ \"prestart\" ],\n\
7373
\"annotation\": [ \"fpga.intel.com/region\" ]\n\
7474
}\n">>/install_root/$SRC_DIR/$CRI_HOOK.json
75-
ARG TOYBOX_VERSION="0.8.6"
76-
ARG TOYBOX_SHA256="e2c4f72a158581a12f4303d0d1aeec196b01f293e495e535bcdaf75eb9ae0987"
75+
ARG TOYBOX_VERSION="0.8.7"
76+
ARG TOYBOX_SHA256="b6f43d5738df54623ed21c32f430d1d5c5ac7ef465a6a883890f104b59d5d9e4"
7777
ARG ROOT=/install_root
7878
RUN apt update && apt -y install musl musl-tools musl-dev
7979
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz -o toybox.tar.gz \

build/docker/intel-gpu-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku
5454
--save_path /install_root/licenses/$CMD/go-licenses ; \
5555
else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi
5656
###
57-
ARG TOYBOX_VERSION="0.8.6"
58-
ARG TOYBOX_SHA256="e2c4f72a158581a12f4303d0d1aeec196b01f293e495e535bcdaf75eb9ae0987"
57+
ARG TOYBOX_VERSION="0.8.7"
58+
ARG TOYBOX_SHA256="b6f43d5738df54623ed21c32f430d1d5c5ac7ef465a6a883890f104b59d5d9e4"
5959
ARG ROOT=/install_root
6060
RUN apt update && apt -y install musl musl-tools musl-dev
6161
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz -o toybox.tar.gz \

build/docker/intel-qat-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ FROM ${GOLANG_BASE} as builder
3939
ARG DIR=/intel-device-plugins-for-kubernetes
4040
WORKDIR $DIR
4141
COPY . .
42-
ARG TOYBOX_VERSION="0.8.6"
43-
ARG TOYBOX_SHA256="e2c4f72a158581a12f4303d0d1aeec196b01f293e495e535bcdaf75eb9ae0987"
42+
ARG TOYBOX_VERSION="0.8.7"
43+
ARG TOYBOX_SHA256="b6f43d5738df54623ed21c32f430d1d5c5ac7ef465a6a883890f104b59d5d9e4"
4444
ARG ROOT=/install_root
4545
RUN apt update && apt -y install musl musl-tools musl-dev
4646
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz -o toybox.tar.gz \

build/docker/intel-sgx-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku
5454
--save_path /install_root/licenses/$CMD/go-licenses ; \
5555
else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi
5656
###
57-
ARG TOYBOX_VERSION="0.8.6"
58-
ARG TOYBOX_SHA256="e2c4f72a158581a12f4303d0d1aeec196b01f293e495e535bcdaf75eb9ae0987"
57+
ARG TOYBOX_VERSION="0.8.7"
58+
ARG TOYBOX_SHA256="b6f43d5738df54623ed21c32f430d1d5c5ac7ef465a6a883890f104b59d5d9e4"
5959
ARG ROOT=/install_root
6060
RUN apt update && apt -y install musl musl-tools musl-dev
6161
RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION.tar.gz -o toybox.tar.gz \

build/docker/lib/toybox_build.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG TOYBOX_VERSION="0.8.6"
2-
ARG TOYBOX_SHA256="e2c4f72a158581a12f4303d0d1aeec196b01f293e495e535bcdaf75eb9ae0987"
1+
ARG TOYBOX_VERSION="0.8.7"
2+
ARG TOYBOX_SHA256="b6f43d5738df54623ed21c32f430d1d5c5ac7ef465a6a883890f104b59d5d9e4"
33

44
ARG ROOT=/install_root
55

build/docker/toybox-config

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
22
# Automatically generated make config: don't edit
33
# ToyBox version: KCONFIG_VERSION
4-
# Fri Mar 25 12:05:23 2022
4+
# Wed Jun 8 09:08:35 2022
55
#
6-
# CONFIG_TOYBOX_CONTAINER is not set
7-
# CONFIG_TOYBOX_FIFREEZE is not set
6+
CONFIG_TOYBOX_CONTAINER=y
7+
CONFIG_TOYBOX_FIFREEZE=y
88
CONFIG_TOYBOX_ICONV=y
99
CONFIG_TOYBOX_UTMPX=y
1010
CONFIG_TOYBOX_SHADOW=y
@@ -13,17 +13,15 @@ CONFIG_TOYBOX_SHADOW=y
1313
CONFIG_TOYBOX_FORK=y
1414
CONFIG_TOYBOX_PRLIMIT=y
1515
CONFIG_TOYBOX_GETRANDOM=y
16-
# CONFIG_TOYBOX_COPYFILERANGE is not set
17-
CONFIG_TOYBOX_HASTIMERS=y
16+
CONFIG_TOYBOX_COPYFILERANGE=y
17+
# CONFIG_TOYBOX_HASTIMERS is not set
1818

1919
#
2020
# Posix commands
2121
#
2222
# CONFIG_BASENAME is not set
2323
# CONFIG_CAL is not set
2424
CONFIG_CAT=y
25-
# CONFIG_CAT_V is not set
26-
# CONFIG_CATV is not set
2725
# CONFIG_CHGRP is not set
2826
# CONFIG_CHOWN is not set
2927
# CONFIG_CHMOD is not set
@@ -111,7 +109,7 @@ CONFIG_TEST_GLUE=y
111109
# CONFIG_XARGS is not set
112110

113111
#
114-
# pending (see toys/pending/README)
112+
# Pending (unfinished) commands
115113
#
116114
# CONFIG_ARP is not set
117115
# CONFIG_ARPING is not set
@@ -122,8 +120,8 @@ CONFIG_TEST_GLUE=y
122120
# CONFIG_CROND is not set
123121
# CONFIG_CRONTAB is not set
124122
# CONFIG_DD is not set
125-
# CONFIG_DHCP6 is not set
126123
# CONFIG_DHCP is not set
124+
# CONFIG_DHCP6 is not set
127125
# CONFIG_DHCPD is not set
128126
# CONFIG_DEBUG_DHCP is not set
129127
# CONFIG_DIFF is not set
@@ -139,7 +137,6 @@ CONFIG_TEST_GLUE=y
139137
# CONFIG_GROUPDEL is not set
140138
# CONFIG_HEXDUMP is not set
141139
# CONFIG_HD is not set
142-
# CONFIG_HOST is not set
143140
# CONFIG_INIT is not set
144141
# CONFIG_IP is not set
145142
# CONFIG_IPCRM is not set
@@ -158,8 +155,6 @@ CONFIG_TEST_GLUE=y
158155
# CONFIG_MKE2FS_EXTENDED is not set
159156
# CONFIG_MODPROBE is not set
160157
# CONFIG_MORE is not set
161-
# CONFIG_OPENVT is not set
162-
# CONFIG_DEALLOCVT is not set
163158
# CONFIG_ROUTE is not set
164159
CONFIG_SH=y
165160
# CONFIG_CD is not set
@@ -184,14 +179,11 @@ CONFIG_SH=y
184179
# CONFIG_TELNETD is not set
185180
# CONFIG_TFTP is not set
186181
# CONFIG_TFTPD is not set
187-
# CONFIG_TRACEROUTE is not set
188182
# CONFIG_TR is not set
183+
# CONFIG_TRACEROUTE is not set
189184
# CONFIG_USERADD is not set
190185
# CONFIG_USERDEL is not set
191186
# CONFIG_VI is not set
192-
# CONFIG_WGET is not set
193-
# CONFIG_WGET_LIBTLS is not set
194-
# CONFIG_WGET_OPENSSL is not set
195187
# CONFIG_XZCAT is not set
196188

197189
#
@@ -211,7 +203,6 @@ CONFIG_SH=y
211203
# CONFIG_CHCON is not set
212204
# CONFIG_CHROOT is not set
213205
# CONFIG_CHRT is not set
214-
# CONFIG_CHVT is not set
215206
# CONFIG_CLEAR is not set
216207
# CONFIG_COUNT is not set
217208
# CONFIG_DEVMEM is not set
@@ -226,6 +217,11 @@ CONFIG_SH=y
226217
# CONFIG_FREERAMDISK is not set
227218
# CONFIG_FSFREEZE is not set
228219
# CONFIG_FSYNC is not set
220+
# CONFIG_GPIODETECT is not set
221+
# CONFIG_GPIOFIND is not set
222+
# CONFIG_GPIOINFO is not set
223+
# CONFIG_GPIOGET is not set
224+
# CONFIG_GPIOSET is not set
229225
# CONFIG_HELP is not set
230226
# CONFIG_HEXEDIT is not set
231227
# CONFIG_HWCLOCK is not set
@@ -243,7 +239,6 @@ CONFIG_SH=y
243239
# CONFIG_CHATTR is not set
244240
# CONFIG_LSMOD is not set
245241
CONFIG_LSPCI=y
246-
# CONFIG_LSPCI_TEXT is not set
247242
# CONFIG_LSUSB is not set
248243
# CONFIG_MAKEDEVS is not set
249244
# CONFIG_MCOOKIE is not set
@@ -256,6 +251,9 @@ CONFIG_LSPCI=y
256251
# CONFIG_UNSHARE is not set
257252
# CONFIG_NSENTER is not set
258253
# CONFIG_ONEIT is not set
254+
# CONFIG_OPENVT is not set
255+
# CONFIG_CHVT is not set
256+
# CONFIG_DEALLOCVT is not set
259257
# CONFIG_PARTPROBE is not set
260258
# CONFIG_PIVOT_ROOT is not set
261259
# CONFIG_PMAP is not set
@@ -285,32 +283,36 @@ CONFIG_LSPCI=y
285283
# CONFIG_TASKSET is not set
286284
# CONFIG_TIMEOUT is not set
287285
# CONFIG_TRUNCATE is not set
286+
# CONFIG_UCLAMPSET is not set
288287
# CONFIG_UPTIME is not set
289288
# CONFIG_USLEEP is not set
290289
# CONFIG_UUIDGEN is not set
291290
# CONFIG_VCONFIG is not set
292291
# CONFIG_VMSTAT is not set
292+
# CONFIG_W is not set
293293
# CONFIG_WATCH is not set
294294
# CONFIG_WATCHDOG is not set
295-
# CONFIG_W is not set
296295
# CONFIG_WHICH is not set
297296
# CONFIG_XXD is not set
298297
# CONFIG_YES is not set
299298

300299
#
301-
# Networking
300+
# Networking commands
302301
#
303302
# CONFIG_FTPGET is not set
304303
# CONFIG_FTPPUT is not set
304+
# CONFIG_HOST is not set
305+
# CONFIG_HTTPD is not set
305306
# CONFIG_IFCONFIG is not set
306307
# CONFIG_MICROCOM is not set
307308
# CONFIG_NETCAT is not set
308-
# CONFIG_NETCAT_LISTEN is not set
309309
# CONFIG_NETSTAT is not set
310310
# CONFIG_PING is not set
311311
# CONFIG_RFKILL is not set
312312
# CONFIG_SNTP is not set
313313
# CONFIG_TUNCTL is not set
314+
# CONFIG_WGET is not set
315+
# CONFIG_WGET_LIBTLS is not set
314316

315317
#
316318
# Linux Standard Base commands
@@ -354,7 +356,7 @@ CONFIG_LSPCI=y
354356
# CONFIG_SKELETON_ALIAS is not set
355357

356358
#
357-
# Android
359+
# Android commands
358360
#
359361
# CONFIG_GETENFORCE is not set
360362
# CONFIG_LOAD_POLICY is not set
@@ -384,7 +386,6 @@ CONFIG_TOYBOX_LSM_NONE=y
384386
# CONFIG_TOYBOX_FREE is not set
385387
# CONFIG_TOYBOX_NORECURSE is not set
386388
# CONFIG_TOYBOX_DEBUG is not set
387-
# CONFIG_TOYBOX_PEDANTIC_ARGS is not set
388389
CONFIG_TOYBOX_UID_SYS=100
389390
CONFIG_TOYBOX_UID_USR=500
390391
# CONFIG_TOYBOX_FORCE_NOMMU is not set

0 commit comments

Comments
 (0)