Skip to content

Commit

Permalink
version bump 1.5 -> 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
OndrejHome committed Oct 9, 2019
1 parent 506560c commit cded58e
Show file tree
Hide file tree
Showing 14 changed files with 125 additions and 39 deletions.
41 changes: 21 additions & 20 deletions PACKAGING
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <ondrej-xa2iel8u@famera.cz> Wed, 09 Oct 2019 17:00:00 +0900

fast-vm (1.5) unstable; urgency=medium

* recursive scp command
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
54 changes: 54 additions & 0 deletions ebuild/app-emulation/fast-vm/fast-vm-1.6.ebuild
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion fast-vm
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ usage () {
echo "$FVM compact_image ImageName"
;;
*)
echo "== fast-vm version 1.5 <ondrej-xa2iel8u@famera.cz> =="
echo "== fast-vm version 1.6 <ondrej-xa2iel8u@famera.cz> =="
echo "$FVM <action> <options>"
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
Expand Down
2 changes: 1 addition & 1 deletion man/configure-fast-vm.8
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/fast-vm-list.8
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/fast-vm-net-cleanup.8
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/fast-vm.8
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/fast-vm.conf.5
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 8 additions & 2 deletions rpm/fast-vm-el7.spec
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 <ondrej-xa2iel8u@famera.cz> 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 <ofamera@redhat.com> 1.5-1
- recursive scp command
- scp with multiple files (@itsbill)
Expand Down
13 changes: 10 additions & 3 deletions rpm/fast-vm-el8.spec
Original file line number Diff line number Diff line change
@@ -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+
Expand All @@ -18,6 +18,7 @@ Recommends: dnsmasq-utils
Recommends: gzip
Recommends: pv
Recommends: xz
Recommends: zstd
Recommends: libguestfs-tools-c

%description
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 <ondrej-xa2iel8u@famera.cz> 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 <ondrej@famera.cz> 1.5-2
- RHEL 8 Beta preview version of fast-vm

Expand Down
11 changes: 9 additions & 2 deletions rpm/fast-vm-fedora.spec
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -18,6 +18,7 @@ Recommends: dnsmasq-utils
Recommends: gzip
Recommends: pv
Recommends: xz
Recommends: zstd
Recommends: libguestfs-tools-c

%description
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 <ondrej-xa2iel8u@famera.cz> 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 <ofamera@redhat.com> 1.5-1
- recursive scp command
- scp with multiple files (@itsbill)
Expand Down

0 comments on commit cded58e

Please sign in to comment.