From 50a959e6cf5b755df2cac0961cd2ca3930a7ee35 Mon Sep 17 00:00:00 2001 From: Alex Carter Date: Tue, 6 Sep 2022 21:30:55 +0000 Subject: [PATCH 1/2] osbuilder: CC use depmod in rootfs builder for kernel modules Using depmod when adding kernel modules to get dependencies. Needed for the efi secret module for sev. Fixes: #5125 Signed-Off-By: Alex Carter --- tools/osbuilder/rootfs-builder/rootfs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 189362b3c..7cd4be553 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -273,6 +273,8 @@ copy_kernel_modules() info "Copy kernel modules from ${KERNEL_MODULES_DIR}" mkdir -p "${dest_dir}" cp -a "${KERNEL_MODULES_DIR}" "${dest_dir}/" + local KERNEL_VER=$(ls ${dest_dir}) + depmod -b "${rootfs_dir}" ${KERNEL_VER} OK "Kernel modules copied" } From 59537ceb2d6c33c788f5ae423670d0b4066338e7 Mon Sep 17 00:00:00 2001 From: Alex Carter Date: Tue, 6 Sep 2022 21:33:43 +0000 Subject: [PATCH 2/2] 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 c48d5f0b5..d1cf0b9da 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 486c2b497..4311660a6 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