Address PR comments

Author: miz060

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

@@ -40,24 +40,10 @@ if [ "${OS_VERSION}" == "3.0" ]; then
 fi
 
 agent_make_flags="LIBC=gnu OPENSSL_NO_VENDOR=Y DESTDIR=${AGENT_INSTALL_DIR} BUILD_TYPE=${AGENT_BUILD_TYPE}"
-
-#if [ "${CONF_PODS}" == "yes" ]; then
-#	agent_make_flags+=" AGENT_POLICY=yes"
-#fi
 agent_make_flags+=" AGENT_POLICY=yes"
 
 pushd "${repo_dir}"
 
-echo "Building utarfs binary"
-pushd src/utarfs/
-make all
-popd
-
-echo "Building kata-overlay binary"
-pushd src/overlay/
-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

@@ -28,13 +28,6 @@ mkdir -p "${PREFIX}/${SHIM_CONFIG_PATH}"
 mkdir -p "${PREFIX}/${DEBUGGING_BINARIES_PATH}"
 mkdir -p "${PREFIX}/${SHIM_BINARIES_PATH}"
 
-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/
-mkdir -p ${PREFIX}/usr/lib/systemd/system/
-
 echo "Installing diagnosability binaries (monitor, runtime, collect-data script)"
 cp -a --backup=numbered src/runtime/kata-monitor "${PREFIX}/${DEBUGGING_BINARIES_PATH}"
 cp -a --backup=numbered src/runtime/kata-runtime "${PREFIX}/${DEBUGGING_BINARIES_PATH}"
@@ -60,8 +53,9 @@ else
 	echo "Skipping installation of shim configuration"
 fi
 
-echo "Installing virtio-blk based shim configuration"
-cp -a --backup=numbered src/runtime/config/"${SHIM_CONFIG_FILE_NAME}" "${PREFIX}/${SHIM_CONFIG_PATH}/${SHIM_BLK_CONFIG_INST_FILE_NAME}"
-sudo sed -i 's/shared_fs = "virtio-fs"/shared_fs = "none"/' "${PREFIX}/${SHIM_CONFIG_PATH}/${SHIM_BLK_CONFIG_INST_FILE_NAME}"
-
+if [ "${CONF_PODS}" == "no" ]; then
+	echo "Installing virtio-blk based shim configuration"
+	cp -a --backup=numbered src/runtime/config/"${SHIM_CONFIG_FILE_NAME}" "${PREFIX}/${SHIM_CONFIG_PATH}/${SHIM_BLK_CONFIG_INST_FILE_NAME}"
+	sed -i 's/shared_fs = "virtio-fs"/shared_fs = "none"/' "${PREFIX}/${SHIM_CONFIG_PATH}/${SHIM_BLK_CONFIG_INST_FILE_NAME}"
+fi
 popd

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

@@ -18,6 +18,16 @@ source "${common_file}"
 
 pushd "${repo_dir}"
 
+echo "Building utarfs binary"
+pushd src/utarfs/
+make all
+popd
+
+echo "Building kata-overlay binary"
+pushd src/overlay/
+make all
+popd
+
 echo "Building tardev-snapshotter service binary"
 pushd src/tardev-snapshotter/
 make all

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

@@ -21,6 +21,13 @@ source "${common_file}"
 
 pushd "${repo_dir}"
 
+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/
+mkdir -p ${PREFIX}/usr/lib/systemd/system/
+
 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/

tools/osbuilder/rootfs-builder/cbl-mariner/config.sh

@@ -8,5 +8,6 @@ LIBC="gnu"
 PACKAGES="kata-packages-uvm"
 
 [ "$UVM_BUILD_MODE" = debug ] && PACKAGES+=" kata-packages-uvm-debug"
+[ "$CONF_GUEST" = yes ] && PACKAGES+=" kata-packages-uvm-coco"
 [ "$AGENT_INIT" = no ] && PACKAGES+=" systemd"
 [ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp"