From d19f2bb0e3d6a601fd00de6208cd28cb3cfcd424 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 30 Sep 2021 10:23:56 -0400
Subject: [PATCH] Support building genesis-base on Fedora34

---
 makerpm-genesisbuilder                      | 2 +-
 xCAT-genesis-builder/buildrpm               | 2 +-
 xCAT-genesis-builder/xCAT-genesis-base.spec | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/makerpm-genesisbuilder b/makerpm-genesisbuilder
index ae6d3d029..443539643 100755
--- a/makerpm-genesisbuilder
+++ b/makerpm-genesisbuilder
@@ -1,5 +1,5 @@
 #!/bin/sh
-VER=`git describe`
+VER=`cat Version`
 VER=${VER/-/.post}
 VER=${VER/-/.}
 rpmbuild --version > /dev/null
diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index 6965791bd..49c05ff4c 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -12,7 +12,7 @@ DIR=`dirname $0`
 #DIR=`realpath $DIR`
 DIR=`readlink -f $DIR`
 BUILDARCH=`uname -m`
-REQUIRED_PACKAGES="rpmdevtools rpm-build screen lldpad mstflint epel-release ipmitool pciutils mdadm dosfstools usbutils bind-utils psmisc nmap-ncat"
+REQUIRED_PACKAGES="rpmdevtools rpm-build screen lldpad mstflint epel-release ipmitool pciutils mdadm dosfstools usbutils bind-utils psmisc nmap-ncat ethtool kexec-tools"
 
 # Install required packages
 for required_package in $REQUIRED_PACKAGES; do
diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec
index 831008d41..17f780230 100644
--- a/xCAT-genesis-builder/xCAT-genesis-base.spec
+++ b/xCAT-genesis-builder/xCAT-genesis-base.spec
@@ -12,6 +12,8 @@ Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
 %endif
 BuildArch: noarch
 %define name	xCAT-genesis-base-%{tarch}
+# Use xz compression instead of default gzip on Fedora34
+%define _binary_payload w7.xzdio
 %define __spec_install_post :
 %define debug_package %{nil}
 %define __prelink_undo_cmd %{nil}