Update genesis builder to use new scheme

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14576 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd

makegenesisbuilderrpm

@@ -13,11 +13,11 @@ then
 	exit 1
 fi
 echo "The location for rpm building is ${RPMROOT}"
-cd `dirname $0`/xCAT-nbroot2
+cd `dirname $0`/xCAT-genesis-builder
 tar --exclude .svn -cjvf $RPMROOT/SOURCES/xCAT-genesis-builder.tar.bz2 .
 #mv -f *.gz $RPMROOT/SOURCES
 cp LICENSE.html $RPMROOT/BUILD
 cp xCAT-genesis-builder.spec $RPMROOT/SOURCES
 cd -
 rm -f $RPMROOT/SRPMS/xCAT-genesis-builder-$VER*rpm $RPMROOT/RPMS/*/xCAT-genesis-builder-$VER*rpm
-rpmbuild -ba xCAT-nbroot2/xCAT-genesis-builder.spec
+rpmbuild -ba xCAT-genesis-builder/xCAT-genesis-builder.spec

xCAT-genesis-builder/buildrpm

@@ -8,5 +8,6 @@ zcat /tmp/xcatgenesis.$$.rfs|cpio -dumi
 cp /boot/vmlinuz-`uname -r` /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/`uname -m`/kernel
 cd -
 cd /tmp/xcatgenesis.$$
-tar jcf ~/rpmbuild/SOURCES/xCAT-genesis-`uname -m`.tar.bz2 opt
-rpmbuild -ba $DIR/xCAT-genesis.spec 
+tar jcf ~/rpmbuild/SOURCES/xCAT-genesis-base-`uname -m`.tar.bz2 opt
+rpmbuild -ba $DIR/xCAT-genesis-base.spec 
+rm -rf /usr/share/dracut/modules.d/97xcat

xCAT-genesis-builder/install

@@ -589,7 +589,6 @@ dracut_install /usr/share/zoneinfo/posix/NZ
 dracut_install /usr/share/zoneinfo/posix/PRC
 dracut_install /usr/share/zoneinfo/posix/Chile/EasterIsland
 dracut_install /usr/share/zoneinfo/posix/Chile/Continental
-dracut_install /usr/share/zoneinfo/posix/Factory
 inst "$moddir/xcatroot" "/sbin/xcatroot"
 inst "$moddir/restart" "/bin/restart"
 inst "$moddir/dhclient.conf" "/etc/dhclient.conf"