github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-18 07:58:36 +00:00
Code Issues Projects Releases Wiki Activity

osbuilder: CC, add kmod to rootfs builder docker environment

Browse Source 
To use depmod in the rootfs builder, the docker environment will require kmod.

Fixes: kata-containers#5125

Signed-Off-By: Alex Carter <alex.carter@ibm.com>
This commit is contained in:
Alex Carter 2022-09-06 21:33:43 +00:00 committed by Alex
parent 50a959e6cf
commit 59537ceb2d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in
View File

@ -40,7 +40,8 @@ RUN apt-get update && \
pkg-config \ pkg-config \
protobuf-compiler \ protobuf-compiler \
gettext-base \ gettext-base \
umoci umoci \
kmod
# aarch64 requires this name -- link for all # aarch64 requires this name -- link for all
RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc" RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc"

4
tools/osbuilder/rootfs-builder/ubuntu/config.sh
View File

@ -5,11 +5,11 @@
OS_NAME=ubuntu OS_NAME=ubuntu
# This should be Ubuntu's code name, e.g. "focal" (Focal Fossa) for 20.04 # This should be Ubuntu's code name, e.g. "focal" (Focal Fossa) for 20.04
OS_VERSION=${OS_VERSION:-focal} OS_VERSION=${OS_VERSION:-focal}
PACKAGES="chrony iptables" PACKAGES="chrony iptables kmod"
[ "$AGENT_INIT" = no ] && PACKAGES+=" init" [ "$AGENT_INIT" = no ] && PACKAGES+=" init"
[ "$KATA_BUILD_CC" = yes ] && PACKAGES+=" cryptsetup-bin e2fsprogs" [ "$KATA_BUILD_CC" = yes ] && PACKAGES+=" cryptsetup-bin e2fsprogs"
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2" [ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2"
[ "$SKOPEO" = yes ] && PACKAGES+=" libgpgme11" [ "$SKOPEO" = yes ] && PACKAGES+=" libgpgme11 libdevmapper1.02.1"
REPO_URL=http://ports.ubuntu.com REPO_URL=http://ports.ubuntu.com
case "$ARCH" in case "$ARCH" in