Separate out tardev build

Author: miz060

src/runtime/config/configuration-clh-snp.toml.in

@@ -137,7 +137,7 @@ default_maxmemory = @DEFMAXMEMSZ@
 #   - virtio-fs (default)
 #   - virtio-fs-nydus
 #   - none
-shared_fs = "none"
+shared_fs = "@DEFSHAREDFS_CLH_SNP_VIRTIOFS@"
 
 # Path to vhost-user-fs daemon.
 virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@"

src/runtime/config/configuration-clh.toml.in

@@ -132,7 +132,7 @@ default_maxmemory = @DEFMAXMEMSZ@
 #   - virtio-fs (default)
 #   - virtio-fs-nydus
 #   - none
-shared_fs = "none"
+shared_fs = "@DEFSHAREDFS_CLH_VIRTIOFS@"
 
 # Path to vhost-user-fs daemon.
 virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@"

tools/osbuilder/node-builder/azure-linux/Makefile

@@ -75,3 +75,11 @@ deploy-confpods-package-tools:
 .PHONY: deploy-confpods-uvm
 deploy-confpods-uvm:
 	CONF_PODS=yes ./uvm_install.sh
+
+.PHONY: tardev
+tardev:
+	./package_tardev_build.sh
+
+.PHONY: deploy-tardev
+deploy-tardev:
+	./package_tardev_install.sh

tools/osbuilder/node-builder/azure-linux/package_build.sh

@@ -58,11 +58,6 @@ pushd src/overlay/
 make all
 popd
 
-echo "Building tardev-snapshotter service binary"
-pushd src/tardev-snapshotter/
-make all
-popd
-
 echo "Building shim binary and configuration"
 pushd src/runtime/
 if [ "${CONF_PODS}" == "yes" ] || [ "${OS_VERSION}" == "3.0" ]; then

tools/osbuilder/node-builder/azure-linux/package_install.sh

@@ -14,7 +14,6 @@ CONF_PODS=${CONF_PODS:-no}
 PREFIX=${PREFIX:-}
 SHIM_REDEPLOY_CONFIG=${SHIM_REDEPLOY_CONFIG:-yes}
 SHIM_USE_DEBUG_CONFIG=${SHIM_USE_DEBUG_CONFIG:-no}
-START_SERVICES=${START_SERVICES:-yes}
 
 script_dir="$(dirname $(readlink -f $0))"
 repo_dir="${script_dir}/../../../../"
@@ -29,19 +28,13 @@ mkdir -p "${PREFIX}/${SHIM_CONFIG_PATH}"
 mkdir -p "${PREFIX}/${DEBUGGING_BINARIES_PATH}"
 mkdir -p "${PREFIX}/${SHIM_BINARIES_PATH}"
 
-echo "Installing tardev-snapshotter binaries and service file"
+echo "Installing utarfs and kata-overlay binaries"
 mkdir -p ${PREFIX}/usr/sbin
 cp -a --backup=numbered src/utarfs/target/release/utarfs ${PREFIX}/usr/sbin/mount.tar
 mkdir -p ${PREFIX}/usr/bin
 cp -a --backup=numbered src/overlay/target/release/kata-overlay ${PREFIX}/usr/bin/
-cp -a --backup=numbered src/tardev-snapshotter/target/release/tardev-snapshotter ${PREFIX}/usr/bin/
 mkdir -p ${PREFIX}/usr/lib/systemd/system/
-cp -a --backup=numbered src/tardev-snapshotter/tardev-snapshotter.service ${PREFIX}/usr/lib/systemd/system/
 
-echo "Enabling and starting snapshotter service"
-if [ "${START_SERVICES}" == "yes" ]; then
-	systemctl enable tardev-snapshotter && systemctl daemon-reload && systemctl restart tardev-snapshotter
-fi
 
 if [ "${CONF_PODS}" == "yes" ]; then
 	if [ "${SHIM_REDEPLOY_CONFIG}" == "yes" ]; then

tools/osbuilder/node-builder/azure-linux/package_tardev_build.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2024 Microsoft Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set -o errexit
+set -o pipefail
+set -o errtrace
+
+[ -n "$DEBUG" ] && set -x
+
+script_dir="$(dirname $(readlink -f $0))"
+repo_dir="${script_dir}/../../../../"
+
+common_file="common.sh"
+source "${common_file}"
+
+pushd "${repo_dir}"
+
+echo "Building tardev-snapshotter service binary"
+pushd src/tardev-snapshotter/
+make all
+popd
+
+popd

tools/osbuilder/node-builder/azure-linux/package_tardev_install.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2024 Microsoft Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set -o errexit
+set -o pipefail
+set -o errtrace
+
+[ -n "$DEBUG" ] && set -x
+
+PREFIX=${PREFIX:-}
+START_SERVICES=${START_SERVICES:-yes}
+
+script_dir="$(dirname $(readlink -f $0))"
+repo_dir="${script_dir}/../../../../"
+
+common_file="common.sh"
+source "${common_file}"
+
+pushd "${repo_dir}"
+
+echo "Installing tardev-snapshotter binaries and service file"
+mkdir -p ${PREFIX}/usr/bin
+cp -a --backup=numbered src/tardev-snapshotter/target/release/tardev-snapshotter ${PREFIX}/usr/bin/
+mkdir -p ${PREFIX}/usr/lib/systemd/system/
+cp -a --backup=numbered src/tardev-snapshotter/tardev-snapshotter.service ${PREFIX}/usr/lib/systemd/system/
+
+if [ "${START_SERVICES}" == "yes" ]; then
+    echo "Enabling and starting snapshotter service"
+    systemctl enable tardev-snapshotter && systemctl daemon-reload && systemctl restart tardev-snapshotter
+fi
+
+popd

tools/osbuilder/node-builder/azure-linux/uvm_build.sh

@@ -51,10 +51,10 @@ sudo cp ${AGENT_INSTALL_DIR}/usr/lib/systemd/system/kata-containers.target ${ROO
 sudo cp ${AGENT_INSTALL_DIR}/usr/lib/systemd/system/kata-agent.service ${ROOTFS_PATH}/usr/lib/systemd/system/kata-agent.service
 
 echo "Building tarfs kernel driver and installing into rootfs"
-	pushd src/tarfs
-	make KDIR=${UVM_KERNEL_HEADER_DIR}
-	sudo make KDIR=${UVM_KERNEL_HEADER_DIR} KVER=${UVM_KERNEL_VERSION} INSTALL_MOD_PATH=${ROOTFS_PATH} install
-	popd
+pushd src/tarfs
+make KDIR=${UVM_KERNEL_HEADER_DIR}
+sudo make KDIR=${UVM_KERNEL_HEADER_DIR} KVER=${UVM_KERNEL_VERSION} INSTALL_MOD_PATH=${ROOTFS_PATH} install
+popd
 
 if [ "${CONF_PODS}" == "yes" ]; then
 	echo "Building dm-verity protected image based on rootfs"