Merge pull request #3906 from whowutwut/genesis-builder-fix

Resolve issues with xCAT-genesis-builder rpm to more easily create the xCAT-genesis-base

xCAT-genesis-builder/buildrpm

@@ -13,13 +13,16 @@ DIR=`dirname $0`
 DIR=`readlink -f $DIR`
 BUILDARCH=`uname -m`
 
-#For Openpower
-if [ $BUILDARCH = "ppc64le" ]; then
-    BUILDARCH="ppc64"
-fi
+rpmdev-setuptree
 
+#For Openpower
 if [ -z $1 ]; then
-    HOSTOS="fedora26"
+    if [ $BUILDARCH = "ppc64le" ]; then
+        HOSTOS="Pegas1.0"
+        BUILDARCH="ppc64"
+    else
+        HOSTOS="fedora26"
+    fi
 fi
 
 # get the input files for dracut in the right place
@@ -105,6 +108,12 @@ if [ "$HOSTOS" = "mcp" ]; then
 # For ppc64 platform, needs to remove some files,
 # # and some files are in different directories
 elif [ $BUILDARCH = "ppc64" ]; then
+        if [ "$HOSTOS" = "Pegas1.0" ]; then
+	    sed -i 's/ mkreiserfs//' $DRACUTMODDIR/install
+	    sed -i 's/ reiserfstune//' $DRACUTMODDIR/install
+	    sed -i 's/ vconfig//' $DRACUTMODDIR/install
+	    sed -i 's/ ntp-wait//' $DRACUTMODDIR/install
+        fi
         sed -i 's/ efibootmgr//' $DRACUTMODDIR/install
         sed -i 's/ dmidecode//' $DRACUTMODDIR/install
         sed -i 's/\/lib\/terminfo\/l\/linux/\/usr\/share\/terminfo\/l\/linux/g' $DRACUTMODDIR/install

xCAT-genesis-builder/xCAT-genesis-builder.spec

@@ -4,7 +4,7 @@ Version: %{?version:%{version}}%{!?version:%(cat Version)}
 Release: %{?release:%{release}}%{!?release:%(cat Release)}
 Epoch: 1
 AutoReq: false
-Requires: ipmitool screen btrfs-progs lldpad rpm-build compat-libstdc++-33 mstflint xfsprogs nc reiserfs-utils
+Requires: ipmitool screen btrfs-progs lldpad rpm-build mstflint xfsprogs nc rpmdevtools libstdc++-devel pciutils bridge-utils ntp ntp-perl iprutils psmisc mdadm bind-utils dosfstools usbutils libusbx
 Prefix: /opt/xcat
 AutoProv: false