Skip to content

Commit f48031e

Browse files
tkatilatkatila
authored
Merge pull request #1496 from mythi/PR-2023-036
version updates
2 parents 984d0cd + 6faf978 commit f48031e

File tree

8 files changed

+23
-21
lines changed

8 files changed

+23
-21
lines changed

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

Lines changed: 3 additions & 3 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.9"
43-
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
42+
ARG TOYBOX_VERSION="0.8.10"
43+
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
4444
ARG ROOT=/install_root
4545
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
4646
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -49,7 +49,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
4949
&& tar -xzf toybox.tar.gz \
5050
&& rm toybox.tar.gz \
5151
&& cd toybox-$TOYBOX_VERSION \
52-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
52+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
5353
&& install -D LICENSE $ROOT/licenses/toybox \
5454
&& cp -r /usr/share/doc/musl $ROOT/licenses/
5555
###

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ RUN echo "{\n\
7070
\"stage\" : [ \"prestart\" ],\n\
7171
\"annotation\": [ \"fpga.intel.com/region\" ]\n\
7272
}\n">>/install_root/$SRC_DIR/$CRI_HOOK.json
73-
ARG TOYBOX_VERSION="0.8.9"
74-
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
73+
ARG TOYBOX_VERSION="0.8.10"
74+
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
7575
ARG ROOT=/install_root
7676
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
7777
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -80,7 +80,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
8080
&& tar -xzf toybox.tar.gz \
8181
&& rm toybox.tar.gz \
8282
&& cd toybox-$TOYBOX_VERSION \
83-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
83+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
8484
&& install -D LICENSE $ROOT/licenses/toybox \
8585
&& cp -r /usr/share/doc/musl $ROOT/licenses/
8686
###

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku
5353
--save_path /install_root/licenses/$CMD/go-licenses ; \
5454
else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi
5555
###
56-
ARG TOYBOX_VERSION="0.8.9"
57-
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
56+
ARG TOYBOX_VERSION="0.8.10"
57+
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
5858
ARG ROOT=/install_root
5959
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
6060
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -63,7 +63,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
6363
&& tar -xzf toybox.tar.gz \
6464
&& rm toybox.tar.gz \
6565
&& cd toybox-$TOYBOX_VERSION \
66-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
66+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
6767
&& install -D LICENSE $ROOT/licenses/toybox \
6868
&& cp -r /usr/share/doc/musl $ROOT/licenses/
6969
###

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

Lines changed: 3 additions & 3 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.9"
43-
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
42+
ARG TOYBOX_VERSION="0.8.10"
43+
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
4444
ARG ROOT=/install_root
4545
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
4646
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -49,7 +49,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
4949
&& tar -xzf toybox.tar.gz \
5050
&& rm toybox.tar.gz \
5151
&& cd toybox-$TOYBOX_VERSION \
52-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
52+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
5353
&& install -D LICENSE $ROOT/licenses/toybox \
5454
&& cp -r /usr/share/doc/musl $ROOT/licenses/
5555
###

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku
5353
--save_path /install_root/licenses/$CMD/go-licenses ; \
5454
else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi
5555
###
56-
ARG TOYBOX_VERSION="0.8.9"
57-
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
56+
ARG TOYBOX_VERSION="0.8.10"
57+
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
5858
ARG ROOT=/install_root
5959
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
6060
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -63,7 +63,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
6363
&& tar -xzf toybox.tar.gz \
6464
&& rm toybox.tar.gz \
6565
&& cd toybox-$TOYBOX_VERSION \
66-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
66+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
6767
&& install -D LICENSE $ROOT/licenses/toybox \
6868
&& cp -r /usr/share/doc/musl $ROOT/licenses/
6969
###

‎build/docker/lib/toybox_build.docker‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG TOYBOX_VERSION="0.8.9"
2-
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
1+
ARG TOYBOX_VERSION="0.8.10"
2+
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
33

44
ARG ROOT=/install_root
55

@@ -10,7 +10,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
1010
&& tar -xzf toybox.tar.gz \N
1111
&& rm toybox.tar.gz \N
1212
&& cd toybox-$TOYBOX_VERSION \N
13-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \N
13+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \N
1414
&& install -D LICENSE $ROOT/licenses/toybox \N
1515
&& cp -r /usr/share/doc/musl $ROOT/licenses/
1616
###

‎build/docker/toybox-config‎

Lines changed: 4 additions & 2 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-
# Thu Jan 12 14:29:15 2023
4+
# Sat Aug 5 15:52:20 2023
55
#
66
# CONFIG_TOYBOX_ON_ANDROID is not set
77
CONFIG_TOYBOX_FORK=y
@@ -25,6 +25,7 @@ CONFIG_CP=y
2525
# CONFIG_CPIO is not set
2626
CONFIG_CUT=y
2727
# CONFIG_DATE is not set
28+
# CONFIG_DD is not set
2829
# CONFIG_DF is not set
2930
# CONFIG_DIRNAME is not set
3031
# CONFIG_DU is not set
@@ -109,7 +110,6 @@ CONFIG_TEST_GLUE=y
109110
# CONFIG_CHSH is not set
110111
# CONFIG_CROND is not set
111112
# CONFIG_CRONTAB is not set
112-
# CONFIG_DD is not set
113113
# CONFIG_DHCP is not set
114114
# CONFIG_DHCP6 is not set
115115
# CONFIG_DHCPD is not set
@@ -225,6 +225,7 @@ CONFIG_SH=y
225225
# CONFIG_I2CDUMP is not set
226226
# CONFIG_I2CGET is not set
227227
# CONFIG_I2CSET is not set
228+
# CONFIG_I2CTRANSFER is not set
228229
# CONFIG_INOTIFYD is not set
229230
# CONFIG_INSMOD is not set
230231
# CONFIG_IONICE is not set
@@ -270,6 +271,7 @@ CONFIG_REALPATH=y
270271
# CONFIG_SETSID is not set
271272
# CONFIG_SHA3SUM is not set
272273
# CONFIG_SHRED is not set
274+
# CONFIG_SHUF is not set
273275
# CONFIG_STAT is not set
274276
# CONFIG_SWAPOFF is not set
275277
# CONFIG_SWAPON is not set

‎deployments/nfd/base/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.13.1"
4+
- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.13.3"

0 commit comments

Comments
 (0)