From cded58ea86bbd05728fc36493126bf4120b53006 Mon Sep 17 00:00:00 2001 From: Ondrej Famera Date: Wed, 9 Oct 2019 18:26:45 +0900 Subject: [PATCH] version bump 1.5 -> 1.6 --- PACKAGING | 41 +++++++------- README.md | 12 +++-- debian/changelog | 9 ++++ debian/control | 2 +- .../app-emulation/fast-vm/fast-vm-1.6.ebuild | 54 +++++++++++++++++++ fast-vm | 2 +- man/configure-fast-vm.8 | 2 +- man/fast-vm-list.8 | 2 +- man/fast-vm-net-cleanup.8 | 2 +- man/fast-vm.8 | 2 +- man/fast-vm.conf.5 | 2 +- rpm/fast-vm-el7.spec | 10 +++- rpm/fast-vm-el8.spec | 13 +++-- rpm/fast-vm-fedora.spec | 11 +++- 14 files changed, 125 insertions(+), 39 deletions(-) create mode 100644 ebuild/app-emulation/fast-vm/fast-vm-1.6.ebuild diff --git a/PACKAGING b/PACKAGING index 5ad41d0..6baee8b 100644 --- a/PACKAGING +++ b/PACKAGING @@ -3,57 +3,58 @@ This file describes the procedures how to package the fast-vm and related packag === fast-vm RPM for CentOS/RHEL 7 # yum install rpmdevtools bash-completion # rpmdev-setuptree -# curl https://codeload.github.com/OndrejHome/fast-vm/tar.gz/1.5 > rpmbuild/SOURCES/1.5.tar.gz +# curl https://codeload.github.com/OndrejHome/fast-vm/tar.gz/1.6 > rpmbuild/SOURCES/1.6.tar.gz # curl https://raw.githubusercontent.com/OndrejHome/fast-vm/master/rpm/fast-vm-el7.spec > rpmbuild/SPECS/fast-vm.spec # rpmbuild -ba rpmbuild/SPECS/fast-vm.spec resulting files -- rpmbuild/SRPMS/fast-vm-1.5-1.el7.centos.src.rpm -- rpmbuild/RPMS/noarch/fast-vm-1.5-1.el7.centos.noarch.rpm -- rpmbuild/RPMS/noarch/fast-vm-minimal-1.5-1.el7.centos.noarch.rpm +- rpmbuild/SRPMS/fast-vm-1.6-1.el7.src.rpm +- rpmbuild/RPMS/noarch/fast-vm-1.6-1.el7.noarch.rpm +- rpmbuild/RPMS/noarch/fast-vm-minimal-1.6-1.el7.noarch.rpm === fast-vm RPM for CentOS/RHEL 8 # dnf install rpmdevtools bash-completion make # rpmdev-setuptree -# curl https://codeload.github.com/OndrejHome/fast-vm/tar.gz/1.5 > rpmbuild/SOURCES/1.5.tar.gz +# curl https://codeload.github.com/OndrejHome/fast-vm/tar.gz/1.6 > rpmbuild/SOURCES/1.6.tar.gz # curl https://raw.githubusercontent.com/OndrejHome/fast-vm/develop/rpm/fast-vm-el8.spec > rpmbuild/SPECS/fast-vm.spec # rpmbuild -ba rpmbuild/SPECS/fast-vm.spec resulting files -- rpmbuild/SRPMS/fast-vm-1.5-2.el8.src.rpm -- rpmbuild/RPMS/noarch/fast-vm-1.5-2.el8.noarch.rpm -- rpmbuild/RPMS/noarch/fast-vm-minimal-1.5-2.el8.noarch.rpm +- rpmbuild/SRPMS/fast-vm-1.6-1.el8.src.rpm +- rpmbuild/RPMS/noarch/fast-vm-1.6-1.el8.noarch.rpm +- rpmbuild/RPMS/noarch/fast-vm-minimal-1.6-1.el8.noarch.rpm === fast-vm RPM for Fedora # dnf install rpmdevtools bash-completion make # rpmdev-setuptree -# curl https://codeload.github.com/OndrejHome/fast-vm/tar.gz/1.5 > rpmbuild/SOURCES/1.5.tar.gz +# curl https://codeload.github.com/OndrejHome/fast-vm/tar.gz/1.6 > rpmbuild/SOURCES/1.6.tar.gz # curl https://raw.githubusercontent.com/OndrejHome/fast-vm/master/rpm/fast-vm-fedora.spec > rpmbuild/SPECS/fast-vm.spec # rpmbuild -ba rpmbuild/SPECS/fast-vm.spec resulting files -- rpmbuild/SRPMS/fast-vm-1.5-1.fc29.src.rpm -- rpmbuild/RPMS/noarch/fast-vm-1.5-1.fc29.noarch.rpm -- rpmbuild/RPMS/noarch/fast-vm-minimal-1.5-1.fc29.noarch.rpm +- rpmbuild/SRPMS/fast-vm-1.6-1.fc30.src.rpm +- rpmbuild/RPMS/noarch/fast-vm-1.6-1.fc30.noarch.rpm +- rpmbuild/RPMS/noarch/fast-vm-minimal-1.6-1.fc30.noarch.rpm -=== fast-vm DEB for Debian +=== fast-vm DEB for Debian 9/10 # apt-get install dpkg-dev debhelper -# curl https://codeload.github.com/OndrejHome/fast-vm/tar.gz/1.5 > 1.5.tar.gz -# tar xf 1.5.tar.gz -# cd fast-vm-1.5 +# curl https://codeload.github.com/OndrejHome/fast-vm/tar.gz/1.6 > 1.6.tar.gz +# tar xf 1.6.tar.gz +# cd fast-vm-1.6 +(Debian 10-only) # sed -i 's/Standards-Version:.*/Standards-Version: 4.3.0/' debian/control # dpkg-buildpackage -us -uc resulting files -- fast-vm_1.5_all.deb -- fast-vm_1.5_amd64.changes +- fast-vm_1.6_all.deb +- fast-vm_1.6_amd64.changes additional commands for checking # apt-get install lintian -# lintian -i -I --show-overrides --no-tag-display-limit fast-vm_1.5_amd64.changes +# lintian -i -I --show-overrides --no-tag-display-limit fast-vm_1.6_amd64.changes === fast-vm ebuild for Gentoo Git tag for new version must exist in order to be able to generate the correct checksum for the source. -# ebuild fast-vm-1.5.ebuild Manifest +# ebuild fast-vm-1.6.ebuild Manifest === qemu-kvm RPM for CentOS/RHEL 7 (used to add the LSI_SCSI and MEGASAS_SCSI support) diff --git a/README.md b/README.md index ef9b178..9cbf725 100644 --- a/README.md +++ b/README.md @@ -33,12 +33,14 @@ Other resource: [https://www.famera.cz/blog/fast-vm/index.html](https://www.fame ### Supported/Tested OS {#supported_os} Distribution Installation method -- RHEL 7.5 RPM -- CentOS 7.5 RPM -- Fedora 28 RPM -- Debian 9.5 DEB +- RHEL 7.7 RPM +- RHEL 8.0 RPM +- CentOS 7.7 RPM +- CentOS 8.0 RPM +- Fedora 30 RPM +- Debian 9.11 DEB +- Debian 10.1 DEB - Gentoo ebuild -- RHEL 8.0 Beta RPM (experimental) ### Requirements {#requirements} - libvirt with qemu/kvm diff --git a/debian/changelog b/debian/changelog index a744d10..25556e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +fast-vm (1.6) unstable; urgency=medium + + * Debian 10 support + * 'compact' and 'copact_image' commands added + * zst compression support + * various fixes and documentation improvements + + -- Ondrej Famera Wed, 09 Oct 2019 17:00:00 +0900 + fast-vm (1.5) unstable; urgency=medium * recursive scp command diff --git a/debian/control b/debian/control index eebd6f1..1d0891f 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: https://github.com/OndrejHome/fast-vm/ Package: fast-vm Architecture: all Depends: ${misc:Depends}, libvirt-daemon, libvirt-clients, libvirt-daemon-system, dnsmasq-utils, curl, sudo, thin-provisioning-tools, gawk -Recommends: bash-completion, ovmf, pv, libguestfs-tools +Recommends: bash-completion, ovmf, pv, libguestfs-tools, zstd Description: Script for defining VMs from images provided in thin LVM pool fast-vm provides command-line interface to create virtual machines (VMs) in libvirt, based on imported disks in LVM and XML templates. diff --git a/ebuild/app-emulation/fast-vm/fast-vm-1.6.ebuild b/ebuild/app-emulation/fast-vm/fast-vm-1.6.ebuild new file mode 100644 index 0000000..8dd5fb6 --- /dev/null +++ b/ebuild/app-emulation/fast-vm/fast-vm-1.6.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit linux-info + +DESCRIPTION="Script for defining VMs from images provided in thin LVM pool" +HOMEPAGE="https://www.famera.cz/blog/fast-vm/about.html" +SRC_URI="https://github.com/OndrejHome/fast-vm/archive/1.6.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+hack-file-dependencies +bash-completion +zstd" + +# built time dependencies +DEPEND="" +# runtime dependencies +RDEPEND=" + app-emulation/libvirt[virt-network] + net-dns/dnsmasq[dhcp-tools,script] + sys-apps/gawk + sys-apps/coreutils + app-admin/sudo + dev-libs/libxml2 + sys-fs/lvm2[thin] + net-misc/openssh + || ( net-misc/curl net-misc/wget ) + hack-file-dependencies? ( + >=app-emulation/libguestfs-1.36.4 + >=app-emulation/libguestfs-appliance-1.36.1 + app-emulation/libvirt[virt-network,qemu] + ) + bash-completion? ( app-shells/bash-completion ) + zstd? ( app-arch/zstd ) +" + +src_compile() { + return +} + +pkg_setup() { + # check if some basic kernel modules not checked elsewhere are needed + CONFIG_CHECK=" + ~DM_SNAPSHOT + ~DM_THIN_PROVISIONING + ~CONFIG_NF_NAT_IPV4 + ~CONFIG_NF_NAT_MASQUERADE_IPV4" + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi +} diff --git a/fast-vm b/fast-vm index a586b62..d8a5523 100755 --- a/fast-vm +++ b/fast-vm @@ -318,7 +318,7 @@ usage () { echo "$FVM compact_image ImageName" ;; *) - echo "== fast-vm version 1.5 ==" + echo "== fast-vm version 1.6 ==" echo "$FVM " for cmd in import_image import_custom_image export_image remove_image resize_image import_profile remove_profile list_images create delete edit_note resize info list start stop console keydist ssh scp compact compact_image; do diff --git a/man/configure-fast-vm.8 b/man/configure-fast-vm.8 index a0c58e5..65f75c4 100644 --- a/man/configure-fast-vm.8 +++ b/man/configure-fast-vm.8 @@ -1,4 +1,4 @@ -.TH FAST-VM 8 "configure-fast-vm 1.5 (2016-06-25)" "fast-vm" "configure-fast-vm" \" -*- nroff -*- +.TH FAST-VM 8 "configure-fast-vm 1.6 (2016-06-25)" "fast-vm" "configure-fast-vm" \" -*- nroff -*- .SH NAME configure-fast-vm \(em script for (re)configuring fast-vm .SH SYNOPSIS diff --git a/man/fast-vm-list.8 b/man/fast-vm-list.8 index 1ec92a5..e88ab8d 100644 --- a/man/fast-vm-list.8 +++ b/man/fast-vm-list.8 @@ -1,4 +1,4 @@ -.TH FAST-VM 8 "fast-vm 1.5 (2017-11-14)" "fast-vm" "fast-vm" \" -*- nroff -*- +.TH FAST-VM 8 "fast-vm 1.6 (2019-09-01)" "fast-vm" "fast-vm" \" -*- nroff -*- .SH NAME fast-vm list \(em shows the list of VMs recognized by fast-vm .SH SYNOPSIS diff --git a/man/fast-vm-net-cleanup.8 b/man/fast-vm-net-cleanup.8 index 62ffa4a..3477481 100644 --- a/man/fast-vm-net-cleanup.8 +++ b/man/fast-vm-net-cleanup.8 @@ -1,4 +1,4 @@ -.TH FAST-VM 8 "fast-vm-net-cleanup 1.5 (2018-06-17)" "fast-vm" "fast-vm-net-cleanup" \" -*- nroff -*- +.TH FAST-VM 8 "fast-vm-net-cleanup 1.6 (2019-09-01)" "fast-vm" "fast-vm-net-cleanup" \" -*- nroff -*- .SH NAME fast-vm-net-cleanup \(em script for removing staled DHCP leases from fast-vm libvirt network .SH SYNOPSIS diff --git a/man/fast-vm.8 b/man/fast-vm.8 index 3f4fab1..81435cc 100644 --- a/man/fast-vm.8 +++ b/man/fast-vm.8 @@ -1,4 +1,4 @@ -.TH FAST-VM 8 "fast-vm 1.5 (2018-05-03)" "fast-vm" "fast-vm" \" -*- nroff -*- +.TH FAST-VM 8 "fast-vm 1.6 (2019-10-03)" "fast-vm" "fast-vm" \" -*- nroff -*- .SH NAME fast-vm \(em script for creating VMs from images on top of thin LVM pool .SH SYNOPSIS diff --git a/man/fast-vm.conf.5 b/man/fast-vm.conf.5 index 622f08b..84ddcff 100644 --- a/man/fast-vm.conf.5 +++ b/man/fast-vm.conf.5 @@ -1,4 +1,4 @@ -.TH FAST-VM.CONF 5 "fast-vm 1.5 (2018-04-29)" "fast-vm" "/etc/fast-vm.conf" \" -*- nroff -*- +.TH FAST-VM.CONF 5 "fast-vm 1.6 (2019-09-01)" "fast-vm" "/etc/fast-vm.conf" \" -*- nroff -*- .SH NAME fast-vm.conf \(em global configuration file for fast-vm located in /etc/fast-vm.conf diff --git a/rpm/fast-vm-el7.spec b/rpm/fast-vm-el7.spec index 3bc7b58..b63b261 100644 --- a/rpm/fast-vm-el7.spec +++ b/rpm/fast-vm-el7.spec @@ -1,5 +1,5 @@ Name: fast-vm -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Script for defining VMs from images provided in thin LVM pool - with extra dependencies @@ -43,7 +43,7 @@ Requires: qemu-kvm Requires: libvirt-daemon-driver-storage Requires: libvirt-daemon-driver-lxc Requires: libvirt-daemon-driver-qemu -Conflicts: %{name} < 1.5 +Conflicts: %{name} < 1.6 Summary: Script for defining VMs from images provided in thin LVM pool %description minimal @@ -81,6 +81,12 @@ drive of new machine before starting VM using the 'hack files'. %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-sudoers %changelog +* Wed Oct 09 2019 Ondrej Famera 1.6-1 +- CentOS/RHEL 8 support +- zst compression support (if installed) +- 'compact' and 'compact_image' commands added +- various fixes and documentation improvements + * Thu Jul 19 2018 Ondrej Famera 1.5-1 - recursive scp command - scp with multiple files (@itsbill) diff --git a/rpm/fast-vm-el8.spec b/rpm/fast-vm-el8.spec index e20ab1c..cfd477a 100755 --- a/rpm/fast-vm-el8.spec +++ b/rpm/fast-vm-el8.spec @@ -1,6 +1,6 @@ Name: fast-vm -Version: 1.5 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Script for defining VMs from images provided in thin LVM pool - with extra dependencies License: GPLv3+ @@ -18,6 +18,7 @@ Recommends: dnsmasq-utils Recommends: gzip Recommends: pv Recommends: xz +Recommends: zstd Recommends: libguestfs-tools-c %description @@ -50,7 +51,7 @@ Requires: util-linux Requires: qemu-kvm Requires: libvirt-daemon-driver-storage Requires: libvirt-daemon-driver-qemu -Conflicts: %{name} < 1.5 +Conflicts: %{name} < 1.6 %description minimal %{name} provides command-line interface to create virtual machines (VMs) in @@ -87,6 +88,12 @@ drive of new machine before starting VM using the 'hack files'. %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-sudoers %changelog +* Wed Oct 09 2019 Ondrej Famera 1.6-1 +- CentOS/RHEL 8 support +- zst compression support (if installed) +- 'compact' and 'compact_image' commands added +- various fixes and documentation improvements + * Thu Mar 21 2019 Ondrej Famera 1.5-2 - RHEL 8 Beta preview version of fast-vm diff --git a/rpm/fast-vm-fedora.spec b/rpm/fast-vm-fedora.spec index a4b4a37..e05a554 100755 --- a/rpm/fast-vm-fedora.spec +++ b/rpm/fast-vm-fedora.spec @@ -1,5 +1,5 @@ Name: fast-vm -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Script for defining VMs from images provided in thin LVM pool - with extra dependencies @@ -18,6 +18,7 @@ Recommends: dnsmasq-utils Recommends: gzip Recommends: pv Recommends: xz +Recommends: zstd Recommends: libguestfs-tools-c %description @@ -51,7 +52,7 @@ Requires: qemu-kvm Requires: libvirt-daemon-driver-storage Requires: libvirt-daemon-driver-lxc Requires: libvirt-daemon-driver-qemu -Conflicts: %{name} < 1.5 +Conflicts: %{name} < 1.6 %description minimal %{name} provides command-line interface to create virtual machines (VMs) in @@ -88,6 +89,12 @@ drive of new machine before starting VM using the 'hack files'. %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-sudoers %changelog +* Wed Oct 09 2019 Ondrej Famera 1.6-1 +- CentOS/RHEL 8 support +- zst compression support (if installed) +- 'compact' and 'compact_image' commands added +- various fixes and documentation improvements + * Thu Jul 19 2018 Ondrej Famera 1.5-1 - recursive scp command - scp with multiple files (@itsbill)