From e41c4e0cc16e5548137511c34a0aa1a28933144a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 18 Oct 2023 05:26:32 +0200 Subject: [PATCH] Finalize deb packaging --- debian/build-deb.sh | 20 ++++++++++++++------ debian/control | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/build-deb.sh b/debian/build-deb.sh index 7d5027f..aa8d378 100755 --- a/debian/build-deb.sh +++ b/debian/build-deb.sh @@ -5,21 +5,29 @@ set -e VERSION=$1 SELF_TEST_IMG=$2 -tmp_dir=.debpkg/usr/lib/yagna/plugins/ya-runtime-vm-nvidia/runtime +tmp_dir=.debpkg/usr/lib/yagna/plugins/ya-runtime-vm-nvidia -mkdir -p ${tmp_dir} +mkdir -p ${tmp_dir}/runtime mkdir -p .debpkg/DEBIAN -cp "$SELF_TEST_IMG" "${tmp_dir}/self-test.gvmi" -for file in bios-256k.bin efi-virtio.rom initramfs.cpio.gz kvmvapic.bin linuxboot_dma.bin vmlinuz-virt vmrt; do - ln -s ../../ya-runtime-vm/runtime/$file ${tmp_dir}/ +cp "$SELF_TEST_IMG" "${tmp_dir}/runtime/self-test.gvmi" +for file in bios-256k.bin efi-virtio.rom kvmvapic.bin linuxboot_dma.bin vmrt; do + ln -s ../../ya-runtime-vm/runtime/$file ${tmp_dir}/runtime/ done +ln -s ../../ya-runtime-vm/ya-runtime-vm ${tmp_dir}/ya-runtime-vm-nvidia +cp conf/ya-runtime-vm-nvidia.json ${tmp_dir}.json + cp debian/* .debpkg/DEBIAN/ VERSION="$(echo "$VERSION" | sed -E "s,^refs/tags/,,")" -FIXED_VERSION="$(echo "$VERSION" | sed -E 's/^v//')" +if [[ "$VERSION" = "pre-rel-"* ]]; then + FIXED_VERSION="$(echo "$VERSION" | sed -E 's/^pre-rel-v//;s/-rc/~rc/')" +else + FIXED_VERSION="$(echo "$VERSION" | sed -E 's/^v//')" +fi sed -i "s/#version/${FIXED_VERSION}/g" .debpkg/DEBIAN/control +sed -i "s/__VERSION__/${FIXED_VERSION}/g" ${tmp_dir}.json DEB_FILE="ya-runtime-vm-nvidia_${VERSION}.deb" diff --git a/debian/control b/debian/control index 0f3d636..8e8a73e 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,6 @@ Package: ya-runtime-vm-nvidia Version: #version Maintainer: Golem Factory Architecture: all -Depends: ya-runtime-vm +Depends: ya-runtime-vm, golem-nvidia-kernel Priority: standard Description: VM + Nvidia runtime for Yagna.