Revert "Revert "Add kata metapackage change""

Author: miz060

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

@@ -5,7 +5,8 @@
 OS_NAME=cbl-mariner
 OS_VERSION=${OS_VERSION:-2.0}
 LIBC="gnu"
-PACKAGES="core-packages-base-image ca-certificates device-mapper"
+PACKAGES="kata-packages-uvm"
+[ "$CONF_GUEST" = yes ] && PACKAGES+=" kata-packages-uvm-coco"
 [ "$AGENT_INIT" = no ] && PACKAGES+=" systemd"
 [ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp"
 [ "$AGENT_POLICY" = yes ] && PACKAGES+=" opa" || true

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

@@ -22,69 +22,5 @@ build_rootfs()
 	info "install packages for rootfs"
 	$DNF install ${EXTRA_PKGS} ${PACKAGES}
 
-	# Reduce the image size, for faster TEE memory measurement.
-	local MARINER_REMOVED_PACKAGES=( \
-		"bc" \
-		"bridge-utils" \
-		"bzip2" \
-		"chkconfig" \
-		"cracklib-dicts" \
-		"curl" \
-		"curl-libs" \
-		"cyrus-sasl-lib" \
-		"e2fsprogs" \
-		"expat" \
-		"file" \
-		"findutils" \
-		"gdbm" \
-		"gmp" \
-		"gnupg2" \
-		"gpgme" \
-		"gzip" \
-		"iana-etc" \
-		"iproute" \
-		"iputils" \
-		"krb5" \
-		"libarchive" \
-		"libassuan" \
-		"libdb" \
-		"libksba" \
-		"libpwquality" \
-		"libsolv" \
-		"libssh2" \
-		"libtool" \
-		"libuv" \
-		"libxml2" \
-		"lua-libs" \
-		"mariner-rpm-macros" \
-		"ncurses" \
-		"nghttp2" \
-		"net-tools" \
-		"nettle" \
-		"newt" \
-		"npth" \
-		"openldap" \
-		"openssh-clients" \
-		"openssl" \
-		"pinentry" \
-		"pcre" \
-		"rpm" \
-		"rpm-libs" \
-		"sed" \
-		"shadow-utils" \
-		"sqlite-libs" \
-		"slang" \
-		"sudo" \
-		"tar" \
-		"tzdata" \
-		"xz" \
-	)
-
-	for MARINER_REMOVED_PACKAGE in ${MARINER_REMOVED_PACKAGES[@]}
-	do
-		info "removing package ${MARINER_REMOVED_PACKAGE}"
-		rpm -e "${MARINER_REMOVED_PACKAGE}" --nodeps --root=${ROOTFS_DIR}
-	done
-
 	rm -rf ${ROOTFS_DIR}/usr/share/{bash-completion,cracklib,doc,info,locale,man,misc,pixmaps,terminfo,zoneinfo,zsh}
 }