From 2c0d2eb187555cf1328635f676d2f505a72cb5d7 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Fri, 13 Jan 2023 13:46:38 +0200 Subject: [PATCH] images: update toybox v0.8.9 Signed-off-by: Mikko Ylinen --- build/docker/intel-dlb-initcontainer.Dockerfile | 6 +++--- build/docker/intel-fpga-initcontainer.Dockerfile | 6 +++--- build/docker/intel-gpu-initcontainer.Dockerfile | 6 +++--- build/docker/intel-qat-initcontainer.Dockerfile | 6 +++--- build/docker/intel-sgx-initcontainer.Dockerfile | 6 +++--- build/docker/lib/toybox_build.docker | 6 +++--- build/docker/toybox-config | 9 ++++++++- 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/build/docker/intel-dlb-initcontainer.Dockerfile b/build/docker/intel-dlb-initcontainer.Dockerfile index ecdb6192..94f14542 100644 --- a/build/docker/intel-dlb-initcontainer.Dockerfile +++ b/build/docker/intel-dlb-initcontainer.Dockerfile @@ -39,8 +39,8 @@ FROM ${GOLANG_BASE} as builder ARG DIR=/intel-device-plugins-for-kubernetes WORKDIR $DIR COPY . . -ARG TOYBOX_VERSION="0.8.8" -ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898" +ARG TOYBOX_VERSION="0.8.9" +ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65" ARG ROOT=/install_root RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -49,7 +49,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION && tar -xzf toybox.tar.gz \ && rm toybox.tar.gz \ && cd toybox-$TOYBOX_VERSION \ - && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \ + && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \ && install -D LICENSE $ROOT/licenses/toybox \ && cp -r /usr/share/doc/musl $ROOT/licenses/ ### diff --git a/build/docker/intel-fpga-initcontainer.Dockerfile b/build/docker/intel-fpga-initcontainer.Dockerfile index 176c3786..b64fde99 100644 --- a/build/docker/intel-fpga-initcontainer.Dockerfile +++ b/build/docker/intel-fpga-initcontainer.Dockerfile @@ -70,8 +70,8 @@ RUN echo "{\n\ \"stage\" : [ \"prestart\" ],\n\ \"annotation\": [ \"fpga.intel.com/region\" ]\n\ }\n">>/install_root/$SRC_DIR/$CRI_HOOK.json -ARG TOYBOX_VERSION="0.8.8" -ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898" +ARG TOYBOX_VERSION="0.8.9" +ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65" ARG ROOT=/install_root RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -80,7 +80,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION && tar -xzf toybox.tar.gz \ && rm toybox.tar.gz \ && cd toybox-$TOYBOX_VERSION \ - && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \ + && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \ && install -D LICENSE $ROOT/licenses/toybox \ && cp -r /usr/share/doc/musl $ROOT/licenses/ ### diff --git a/build/docker/intel-gpu-initcontainer.Dockerfile b/build/docker/intel-gpu-initcontainer.Dockerfile index b345232c..7c62beee 100644 --- a/build/docker/intel-gpu-initcontainer.Dockerfile +++ b/build/docker/intel-gpu-initcontainer.Dockerfile @@ -53,8 +53,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku --save_path /install_root/licenses/$CMD/go-licenses ; \ else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi ### -ARG TOYBOX_VERSION="0.8.8" -ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898" +ARG TOYBOX_VERSION="0.8.9" +ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65" ARG ROOT=/install_root RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -63,7 +63,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION && tar -xzf toybox.tar.gz \ && rm toybox.tar.gz \ && cd toybox-$TOYBOX_VERSION \ - && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \ + && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \ && install -D LICENSE $ROOT/licenses/toybox \ && cp -r /usr/share/doc/musl $ROOT/licenses/ ### diff --git a/build/docker/intel-qat-initcontainer.Dockerfile b/build/docker/intel-qat-initcontainer.Dockerfile index 08da90a0..19204b96 100644 --- a/build/docker/intel-qat-initcontainer.Dockerfile +++ b/build/docker/intel-qat-initcontainer.Dockerfile @@ -39,8 +39,8 @@ FROM ${GOLANG_BASE} as builder ARG DIR=/intel-device-plugins-for-kubernetes WORKDIR $DIR COPY . . -ARG TOYBOX_VERSION="0.8.8" -ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898" +ARG TOYBOX_VERSION="0.8.9" +ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65" ARG ROOT=/install_root RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -49,7 +49,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION && tar -xzf toybox.tar.gz \ && rm toybox.tar.gz \ && cd toybox-$TOYBOX_VERSION \ - && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \ + && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \ && install -D LICENSE $ROOT/licenses/toybox \ && cp -r /usr/share/doc/musl $ROOT/licenses/ ### diff --git a/build/docker/intel-sgx-initcontainer.Dockerfile b/build/docker/intel-sgx-initcontainer.Dockerfile index e79aae8c..01849f59 100644 --- a/build/docker/intel-sgx-initcontainer.Dockerfile +++ b/build/docker/intel-sgx-initcontainer.Dockerfile @@ -53,8 +53,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku --save_path /install_root/licenses/$CMD/go-licenses ; \ else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi ### -ARG TOYBOX_VERSION="0.8.8" -ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898" +ARG TOYBOX_VERSION="0.8.9" +ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65" ARG ROOT=/install_root RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -63,7 +63,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION && tar -xzf toybox.tar.gz \ && rm toybox.tar.gz \ && cd toybox-$TOYBOX_VERSION \ - && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \ + && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \ && install -D LICENSE $ROOT/licenses/toybox \ && cp -r /usr/share/doc/musl $ROOT/licenses/ ### diff --git a/build/docker/lib/toybox_build.docker b/build/docker/lib/toybox_build.docker index f0edbc7c..a525a361 100644 --- a/build/docker/lib/toybox_build.docker +++ b/build/docker/lib/toybox_build.docker @@ -1,5 +1,5 @@ -ARG TOYBOX_VERSION="0.8.8" -ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898" +ARG TOYBOX_VERSION="0.8.9" +ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65" ARG ROOT=/install_root @@ -10,7 +10,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION && tar -xzf toybox.tar.gz \N && rm toybox.tar.gz \N && cd toybox-$TOYBOX_VERSION \N - && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \N + && KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \N && install -D LICENSE $ROOT/licenses/toybox \N && cp -r /usr/share/doc/musl $ROOT/licenses/ ### diff --git a/build/docker/toybox-config b/build/docker/toybox-config index a974b874..adf03dbe 100644 --- a/build/docker/toybox-config +++ b/build/docker/toybox-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # ToyBox version: KCONFIG_VERSION -# Thu Nov 17 14:23:21 2022 +# Thu Jan 12 14:29:15 2023 # # CONFIG_TOYBOX_ON_ANDROID is not set CONFIG_TOYBOX_FORK=y @@ -123,6 +123,12 @@ CONFIG_TEST_GLUE=y # CONFIG_GETFATTR is not set # CONFIG_GETOPT is not set # CONFIG_GETTY is not set +# CONFIG_GITCOMPAT is not set +# CONFIG_GITCLONE is not set +# CONFIG_GITINIT is not set +# CONFIG_GITREMOTE is not set +# CONFIG_GITFETCH is not set +# CONFIG_GITCHECKOUT is not set # CONFIG_GROUPADD is not set # CONFIG_GROUPDEL is not set # CONFIG_HEXDUMP is not set @@ -238,6 +244,7 @@ CONFIG_LSPCI=y # CONFIG_MODINFO is not set # CONFIG_MOUNTPOINT is not set # CONFIG_NBD_CLIENT is not set +# CONFIG_NBD_SERVER is not set # CONFIG_UNSHARE is not set # CONFIG_NSENTER is not set # CONFIG_ONEIT is not set