github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-25 10:43:15 +00:00
Code Issues Projects Releases Wiki Activity

Revert "rootfs: Make OPA build working in docker for s390x and ppc64le"

Browse Source 
This reverts commit d523e865c0, as we will
not depend on the OPA binary anymore.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2024-04-26 10:47:59 +02:00
parent 62bad976e0
commit 7dd2fde22d
5 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/packaging/guest-image/build_image.sh
View File

@@ -47,8 +47,7 @@ build_initrd() {
AGENT_POLICY="${AGENT_POLICY:-}" \
PULL_TYPE="${PULL_TYPE:-default}" \
COCO_GUEST_COMPONENTS_TARBALL="${COCO_GUEST_COMPONENTS_TARBALL:-}" \
PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}" \
GO_VERSION="${GO_VERSION:-}"
PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}"
mv "kata-containers-initrd.img" "${install_dir}/${artifact_name}"
(
cd "${install_dir}"
@@ -70,8 +69,7 @@ build_image() {
AGENT_POLICY="${AGENT_POLICY:-}" \
PULL_TYPE="${PULL_TYPE:-default}" \
COCO_GUEST_COMPONENTS_TARBALL="${COCO_GUEST_COMPONENTS_TARBALL:-}" \
PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}" \
GO_VERSION="${GO_VERSION:-}"
PAUSE_IMAGE_TARBALL="${PAUSE_IMAGE_TARBALL:-}"
mv -f "kata-containers.img" "${install_dir}/${artifact_name}"
if [ -e "root_hash.txt" ]; then
cp root_hash.txt "${install_dir}/"

10
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -315,11 +315,6 @@ install_image() {
if [ "${variant}" == "confidential" ]; then
export COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)"
export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)"
# GO_VERSION should be exported to install the package in ubuntu-rootfs-osbuilder
# This is necessary for installing opa from the source for s390x and ppc64le
if [ "${AGENT_POLICY}" == "yes" ] && [ "${ARCH}" == "s390x" -o "${ARCH}" == "ppc64le" ]; then
export GO_VERSION=$(get_from_kata_deps "languages.golang.meta.newest-version")
fi
fi
else
os_name="$(get_from_kata_deps "assets.image.architecture.${ARCH}.name")"
@@ -389,11 +384,6 @@ install_initrd() {
if [ "${variant}" == "confidential" ]; then
export COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)"
export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)"
# GO_VERSION should be exported to install the package in ubuntu-rootfs-osbuilder
# This is necessary for installing opa from the source for s390x and ppc64le
if [ "${AGENT_POLICY}" == "yes" ] && [ "${ARCH}" == "s390x" -o "${ARCH}" == "ppc64le" ]; then
export GO_VERSION=$(get_from_kata_deps "languages.golang.meta.newest-version")
fi
fi
else
os_name="$(get_from_kata_deps "assets.initrd.architecture.${ARCH}.name")"