From 71ef7740605307cfd70a0df217205ddd514f991c Mon Sep 17 00:00:00 2001 From: ge Date: Tue, 16 Jan 2024 22:51:45 +0300 Subject: [PATCH] upd deps --- packaging/archlinux/Makefile | 2 +- packaging/archlinux/PKGBUILD | 8 ++++++-- packaging/debian/files/control | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packaging/archlinux/Makefile b/packaging/archlinux/Makefile index e66e270..d6d2140 100644 --- a/packaging/archlinux/Makefile +++ b/packaging/archlinux/Makefile @@ -19,4 +19,4 @@ build: clean $(DOCKER_CMD) run --rm -i -v $$PWD/$(BUILDDIR):/mnt --ulimit "nofile=1024:1048576" \ $(DOCKER_IMG) makepkg --nodeps --clean # Remove unwanted files from build dir - rm $(BUILDDIR)/compute*.tar.gz $(BUILDDIR)/PKGBUILD + find $(BUILDDIR) ! -name '*.pkg.tar.zst' -type f -exec rm -f {} + diff --git a/packaging/archlinux/PKGBUILD b/packaging/archlinux/PKGBUILD index a546db5..192659a 100644 --- a/packaging/archlinux/PKGBUILD +++ b/packaging/archlinux/PKGBUILD @@ -1,12 +1,16 @@ pkgname=compute -pkgver='0.1.0-dev4' +pkgver='%placeholder%' pkgrel=1 pkgdesc='Compute instances management library' arch=(any) url=https://get.lulzette.ru/hstack/compute license=('GPL-3-or-later') makedepends=(python python-pip) -depends=(python libvirt libvirt-python qemu-base qemu-system-x86 qemu-img dnsmasq iptables-nft) +depends=(python libvirt libvirt-python qemu-base qemu-system-x86 qemu-img) +optdepends=( + 'dnsmasq: required for default NAT/DHCP' + 'iptables-nft: required for default NAT' +) provides=(compute) conflicts=() diff --git a/packaging/debian/files/control b/packaging/debian/files/control index 5da48cb..d5618d9 100644 --- a/packaging/debian/files/control +++ b/packaging/debian/files/control @@ -38,6 +38,7 @@ Depends: python3-pydantic, mtools, dosfstools, +Recommends: dnsmasq, dnsmasq-base Suggests: