Skip to content

Commit

Permalink
Add kata metapackage change
Browse files Browse the repository at this point in the history
  • Loading branch information
miz060 committed Dec 18, 2023
1 parent 8aec434 commit a87727f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 65 deletions.
2 changes: 1 addition & 1 deletion tools/osbuilder/rootfs-builder/cbl-mariner/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
OS_NAME=cbl-mariner
OS_VERSION=${OS_VERSION:-2.0}
LIBC="gnu"
PACKAGES="core-packages-base-image ca-certificates device-mapper"
PACKAGES="kata-packages-coco-uvm"
[ "$AGENT_INIT" = no ] && PACKAGES+=" systemd"
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp"
[ "$AGENT_POLICY" = yes ] && PACKAGES+=" opa" || true
64 changes: 0 additions & 64 deletions tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}

0 comments on commit a87727f

Please sign in to comment.