github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-11 04:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11046 from mythi/drop-dcap-libs

Browse Source 
build: drop libtdx-attest
This commit is contained in:
RuoqingHe 2025-03-21 09:23:33 +08:00 committed by GitHub
commit e84f7c2c4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
View File

@ -28,24 +28,6 @@ suite=$OS_VERSION
packages=$PACKAGES $EXTRA_PKGS packages=$PACKAGES $EXTRA_PKGS
EOF EOF
if [ "${CONFIDENTIAL_GUEST}" == "yes" ] && [ "${DEB_ARCH}" == "amd64" ]; then
mkdir -p $rootfs_dir/etc/apt/trusted.gpg.d/
curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key |
gpg --dearmour -o $rootfs_dir/etc/apt/trusted.gpg.d/intel-sgx-deb.gpg
sed -i -e "s/bootstrap=Ubuntu/bootstrap=Ubuntu intel-sgx/" $multistrap_conf
SUITE=$OS_VERSION
# Intel does not release sgx stuff for non-LTS, thus if using oracular (24.10),
# we need to enforce getting libtdx-attest from noble.
[ "$SUITE" = "oracular" ] && SUITE="noble"
cat >> $multistrap_conf << EOF
[intel-sgx]
source=https://download.01.org/intel-sgx/sgx_repo/ubuntu
suite=$SUITE
packages=libtdx-attest=1.22\*
EOF
fi
# This fixes the spurious error # This fixes the spurious error
# E: Can't find a source to download version '2021.03.26' of 'ubuntu-keyring:amd64' # E: Can't find a source to download version '2021.03.26' of 'ubuntu-keyring:amd64'
apt update apt update

7
tools/packaging/static-build/coco-guest-components/Dockerfile
View File

@ -12,7 +12,6 @@ ENV RUSTUP_HOME="/opt/rustup"
ENV CARGO_HOME="/opt/cargo" ENV CARGO_HOME="/opt/cargo"
ENV PATH="/opt/cargo/bin/:${PATH}" ENV PATH="/opt/cargo/bin/:${PATH}"
# Note - the TDX lib is only available on x86, so there is an arch check in the package install
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN mkdir ${RUSTUP_HOME} ${CARGO_HOME} && chmod -R a+rwX ${RUSTUP_HOME} ${CARGO_HOME} RUN mkdir ${RUSTUP_HOME} ${CARGO_HOME} && chmod -R a+rwX ${RUSTUP_HOME} ${CARGO_HOME}
@ -21,12 +20,6 @@ RUN apt-get update && \
apt-get --no-install-recommends install -y \ apt-get --no-install-recommends install -y \
ca-certificates \ ca-certificates \
curl \ curl \
gnupg && \
if [ "$(uname -m)" == "x86_64" ]; then curl -sL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg && \
echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
apt-get update && \
apt-get --no-install-recommends -y install libtdx-attest-dev; fi && \
apt-get --no-install-recommends -y install \
binutils \ binutils \
clang \ clang \
g++ \ g++ \