Version 1.9.38

Changelog

@@ -1,3 +1,7 @@
+Version 1.9.38
+---------
+ * Release packages compatible with RHEL9 (#130)
+
 Version 1.9.37
 ---------
  * Update README: add example how to convert qcow images to the required

libvirtnbdbackup/__init__.py

@@ -15,4 +15,4 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-__version__ = "1.9.37"
+__version__ = "1.9.38"

man/virtnbdbackup.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH VIRTNBDBACKUP "1" "August 2023" "virtnbdbackup 1.9.37" "User Commands"
+.TH VIRTNBDBACKUP "1" "August 2023" "virtnbdbackup 1.9.38" "User Commands"
 .SH NAME
 virtnbdbackup \- backup utility for libvirt
 .SH DESCRIPTION
@@ -48,7 +48,7 @@ Backup only disk with target dev name (\fB\-i\fR vda)
 Exclude disk(s) with target dev name (\fB\-x\fR vda,vdb)
 .TP
 \fB\-f\fR SOCKETFILE, \fB\-\-socketfile\fR SOCKETFILE
-Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.4910\/\fP)
+Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.5331\/\fP)
 .TP
 \fB\-n\fR, \fB\-\-noprogress\fR
 Disable progress bar

man/virtnbdmap.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH VIRTNBDMAP "1" "August 2023" "virtnbdmap 1.9.37" "User Commands"
+.TH VIRTNBDMAP "1" "August 2023" "virtnbdmap 1.9.38" "User Commands"
 .SH NAME
 virtnbdmap \- map virtnbdbackup image files to nbd devices
 .SH DESCRIPTION

man/virtnbdrestore.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH VIRTNBDRESTORE "1" "August 2023" "virtnbdrestore 1.9.37" "User Commands"
+.TH VIRTNBDRESTORE "1" "August 2023" "virtnbdrestore 1.9.38" "User Commands"
 .SH NAME
 virtnbdrestore \- restore utility for libvirt
 .SH DESCRIPTION
@@ -40,7 +40,7 @@ Process only disk matching target dev name. (default: None)
 Disable progress bar
 .TP
 \fB\-f\fR SOCKETFILE, \fB\-\-socketfile\fR SOCKETFILE
-Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.4915\/\fP)
+Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.5336\/\fP)
 .TP
 \fB\-r\fR, \fB\-\-raw\fR
 Copy raw images as is during restore. (default: False)

setup.cfg

@@ -6,4 +6,17 @@ long_description = Backup utility for libvirt, using latest changed block tracki
 release = 1
 packager = Michael Ablassmeier <[email protected]>
 doc_files = README.md Changelog LICENSE
-requires = python3-libvirt python3-libnbd python3-lxml python3-tqdm python3-lz4 nbdkit-server nbdkit-python-plugin python3-dataclasses python3-paramiko python3-typing-extensions
+
+# for rhel9 and above, requires must be passed
+# via --requires cmd to skip python3-dataclasses
+requires =
+    python3-libvirt
+    python3-libnbd
+    python3-lxml
+    python3-tqdm
+    python3-lz4
+    nbdkit-server
+    nbdkit-python-plugin
+    python3-dataclasses
+    python3-paramiko
+    python3-typing-extensions

vagrant/build.sh

@@ -3,5 +3,8 @@ set -e
 export VAGRANT_CWD=$(pwd)/debian/
 vagrant up && vagrant destroy -f
 
-export VAGRANT_CWD=$(pwd)/rhel/
+export VAGRANT_CWD=$(pwd)/rhel8/
+vagrant up && vagrant destroy -f
+
+export VAGRANT_CWD=$(pwd)/rhel9/
 vagrant up && vagrant destroy -f

vagrant/rhel9/Vagrantfile

@@ -0,0 +1,33 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  config.vm.box = "generic/alma9"
+  config.vm.box_check_update = false
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.cpus = 2
+    libvirt.memory = 3500
+    libvirt.memorybacking :access, :mode => "shared"
+  end
+  config.vm.provision "shell", inline: <<-SHELL
+    set -xe
+    YUM="yum -yq"
+    $YUM install git rpm-build python3-setuptools
+    $YUM reinstall epel-release || true # epel-release is installed, but files removed
+    rm -rf virtnbdbackup;
+    git clone https://github.com/abbbi/virtnbdbackup
+    cd virtnbdbackup
+    set +x
+    python3.9 setup.py bdist_rpm --python /usr/bin/python3.9 --requires "python3-libvirt python3-libnbd python3-lxml python3-tqdm python3-lz4 nbdkit-server nbdkit-python-plugin python3-paramiko python3-typing-extensions"
+    cp dist/* /vagrant
+    yum install -y dist/*noarch*.rpm
+    virtnbdbackup -h
+    virtnbdrestore -h
+    virtnbdmap -h
+   SHELL
+   config.vm.synced_folder "../../dist", "/vagrant", type: "virtiofs"
+end