From 98e5fe9736031d3f0d2a9ab6b0f018a3fc036c39 Mon Sep 17 00:00:00 2001
From: Michael Ablassmeier <abi@grinser.de>
Date: Tue, 22 Aug 2023 22:56:36 +0200
Subject: [PATCH] use different directories

---
 Changelog                  | 3 +++
 vagrant/build.sh           | 6 ++++++
 vagrant/debian/Vagrantfile | 2 +-
 vagrant/rhel8/Vagrantfile  | 2 +-
 vagrant/rhel9/Vagrantfile  | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index cc7fb5cb..0bfddba3 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,9 @@
 Version 1.9.38
 ---------
  * Release packages compatible with RHEL9 (#130)
+ + add required vagrant file
+ + adjust requirements during package build
+ + put dist files into separate directories
 
 Version 1.9.37
 ---------
diff --git a/vagrant/build.sh b/vagrant/build.sh
index 1417c56b..46a393d1 100644
--- a/vagrant/build.sh
+++ b/vagrant/build.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 set -e
+
+mkdir -p ../dist
+mkdir -p ../dist/debian
+mkdir -p ../dist/rhel8
+mkdir -p ../dist/rhel9
+
 export VAGRANT_CWD=$(pwd)/debian/
 vagrant up && vagrant destroy -f
 
diff --git a/vagrant/debian/Vagrantfile b/vagrant/debian/Vagrantfile
index 7a43b26f..2d23af37 100644
--- a/vagrant/debian/Vagrantfile
+++ b/vagrant/debian/Vagrantfile
@@ -38,5 +38,5 @@ Vagrant.configure("2") do |config|
     virtnbdrestore -h
     virtnbdmap -h
    SHELL
-   config.vm.synced_folder "../../dist", "/vagrant", type: "virtiofs"
+   config.vm.synced_folder "../../dist/debian", "/vagrant", type: "virtiofs"
 end
diff --git a/vagrant/rhel8/Vagrantfile b/vagrant/rhel8/Vagrantfile
index 6a968b92..3f2e0e65 100644
--- a/vagrant/rhel8/Vagrantfile
+++ b/vagrant/rhel8/Vagrantfile
@@ -29,5 +29,5 @@ Vagrant.configure("2") do |config|
     virtnbdrestore -h
     virtnbdmap -h
    SHELL
-   config.vm.synced_folder "../../dist", "/vagrant", type: "virtiofs"
+   config.vm.synced_folder "../../dist/rhel8/", "/vagrant", type: "virtiofs"
 end
diff --git a/vagrant/rhel9/Vagrantfile b/vagrant/rhel9/Vagrantfile
index 767d53ff..d666c9c5 100644
--- a/vagrant/rhel9/Vagrantfile
+++ b/vagrant/rhel9/Vagrantfile
@@ -29,5 +29,5 @@ Vagrant.configure("2") do |config|
     virtnbdrestore -h
     virtnbdmap -h
    SHELL
-   config.vm.synced_folder "../../dist", "/vagrant", type: "virtiofs"
+   config.vm.synced_folder "../../dist/rhel9/", "/vagrant", type: "virtiofs"
 end