From b1730e4a67c4c635820079268fd84cc5f37bd378 Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Mon, 17 Apr 2023 09:49:00 +0000 Subject: [PATCH] gpu: Add new kernel build option to usage() With each release make sure we ship a GPU enabled kernel Signed-off-by: Zvonko Kaiser --- .github/workflows/release.yaml | 4 ++-- .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 1 - tools/packaging/kernel/README.md | 1 + tools/packaging/kernel/build-kernel.sh | 1 + tools/packaging/static-build/kernel/Dockerfile | 3 +-- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f31261d51d..a642fa36fb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -78,7 +78,7 @@ jobs: mv kata-static.tar.xz "$GITHUB_WORKSPACE/${tarball}" pushd $GITHUB_WORKSPACE echo "uploading asset '${tarball}' for tag: ${tag}" - GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a "${tarball}" "${tag}" + GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a "${tarball}" "${tag}" popd upload-cargo-vendored-tarball: @@ -92,7 +92,7 @@ jobs: tarball="kata-containers-$tag-vendor.tar.gz" pushd $GITHUB_WORKSPACE bash -c "tools/packaging/release/generate_vendor.sh ${tarball}" - GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a "${tarball}" "${tag}" + GITHUB_TOKEN=${{ secrets.GIT_UPLOAD_TOKEN }} hub release edit -m "" -a "${tarball}" "${tag}" popd upload-libseccomp-tarball: diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 55fcc0624f..902b067c94 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -81,7 +81,6 @@ options: kernel kernel-dragonball-experimental kernel-experimental - kernel-gpu kernel-tdx-experimental kernel-gpu kernel-gpu-snp diff --git a/tools/packaging/kernel/README.md b/tools/packaging/kernel/README.md index ce4ea30c40..d9b78480a2 100644 --- a/tools/packaging/kernel/README.md +++ b/tools/packaging/kernel/README.md @@ -47,6 +47,7 @@ Options: -f : Enable force generate config when setup. -g : GPU vendor, intel or nvidia. -h : Display this help. + -H : Linux headers for guest fs module building. -k : Path to kernel to build. -p : Path to a directory with patches to apply to kernel, only patches in top-level directory are applied. -t : Hypervisor_target. diff --git a/tools/packaging/kernel/build-kernel.sh b/tools/packaging/kernel/build-kernel.sh index 67c4c8f5c7..88fb61c18b 100755 --- a/tools/packaging/kernel/build-kernel.sh +++ b/tools/packaging/kernel/build-kernel.sh @@ -97,6 +97,7 @@ Options: -f : Enable force generate config when setup. -g : GPU vendor, intel or nvidia. -h : Display this help. + -H : Linux headers for guest fs module building. -k : Path to kernel to build. -p : Path to a directory with patches to apply to kernel. -s : Skip .config checks diff --git a/tools/packaging/static-build/kernel/Dockerfile b/tools/packaging/static-build/kernel/Dockerfile index b4c2329722..183f8a47e2 100644 --- a/tools/packaging/static-build/kernel/Dockerfile +++ b/tools/packaging/static-build/kernel/Dockerfile @@ -23,5 +23,4 @@ RUN apt-get update && \ rsync \ cpio \ patch && \ - if [ "$(uname -m)" = "s390x" ]; then apt-get install -y --no-install-recommends libssl-dev; fi && \ - apt-get clean && rm -rf /var/lib/lists/ + apt-get clean && apt-get autoclean