Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add kata metapackage change #125

Merged
merged 3 commits into from
Dec 21, 2023
Merged

Add kata metapackage change #125

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44186cc
Add kata metapackage change
miz060 Dec 18, 2023
b6cd090
Add new varaiable to differntiate vanilla and coco
miz060 Dec 18, 2023
535cb50
Update package name
miz060 Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tools/osbuilder/rootfs-builder/cbl-mariner/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-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
View file
Open in desktop
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}
}
Loading