From 59537ceb2d6c33c788f5ae423670d0b4066338e7 Mon Sep 17 00:00:00 2001 From: Alex Carter Date: Tue, 6 Sep 2022 21:33:43 +0000 Subject: [PATCH] osbuilder: CC, add kmod to rootfs builder docker environment To use depmod in the rootfs builder, the docker environment will require kmod. Fixes: kata-containers#5125 Signed-Off-By: Alex Carter --- tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in | 3 ++- tools/osbuilder/rootfs-builder/ubuntu/config.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in index c48d5f0b56..d1cf0b9da2 100644 --- a/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in +++ b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in @@ -40,7 +40,8 @@ RUN apt-get update && \ pkg-config \ protobuf-compiler \ gettext-base \ - umoci + umoci \ + kmod # aarch64 requires this name -- link for all RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc" diff --git a/tools/osbuilder/rootfs-builder/ubuntu/config.sh b/tools/osbuilder/rootfs-builder/ubuntu/config.sh index 486c2b4977..4311660a69 100644 --- a/tools/osbuilder/rootfs-builder/ubuntu/config.sh +++ b/tools/osbuilder/rootfs-builder/ubuntu/config.sh @@ -5,11 +5,11 @@ OS_NAME=ubuntu # This should be Ubuntu's code name, e.g. "focal" (Focal Fossa) for 20.04 OS_VERSION=${OS_VERSION:-focal} -PACKAGES="chrony iptables" +PACKAGES="chrony iptables kmod" [ "$AGENT_INIT" = no ] && PACKAGES+=" init" [ "$KATA_BUILD_CC" = yes ] && PACKAGES+=" cryptsetup-bin e2fsprogs" [ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2" -[ "$SKOPEO" = yes ] && PACKAGES+=" libgpgme11" +[ "$SKOPEO" = yes ] && PACKAGES+=" libgpgme11 libdevmapper1.02.1" REPO_URL=http://ports.ubuntu.com case "$ARCH" in