diff --git a/makegenesisbuilderrpm b/makegenesisbuilderrpm index 641fcbbca..c9d901f68 100755 --- a/makegenesisbuilderrpm +++ b/makegenesisbuilderrpm @@ -15,6 +15,7 @@ then exit 1 fi echo "The location for rpm building is ${RPMROOT}" +echo $VER cd `dirname $0`/xCAT-genesis-builder tar --exclude .svn --exclude .*.sw* -cjvf $RPMROOT/SOURCES/xCAT-genesis-builder.tar.bz2 . #mv -f *.gz $RPMROOT/SOURCES diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install index 67e6950fa..fdf8143c7 100755 --- a/xCAT-genesis-builder/install +++ b/xCAT-genesis-builder/install @@ -614,7 +614,7 @@ dracut_install /lib64/rsyslog/lmnet.so dracut_install /lib64/rsyslog/lmstrmsrv.so dracut_install /lib64/rsyslog/imuxsock.so dracut_install /usr/lib64/libnfsidmap/nsswitch.so -dracut_install killall logger nc nslookup bc chown chroot dd expr kill mkdosfs parted rsync shutdown sort ssh-keygen tr blockdev findfs insmod kexec lvm mdadm mke2fs pivot_root sshd swapon tune2fs mkreiserfs reiserfstune pvcreate lvremove vgremove vgcreate lvcreate lvscan lvchange vgchange pvdisplay lvdisplay vgdisplay blkid dmsetup sfdisk # for sysclone +dracut_install killall logger nc nslookup bc chown chroot dd expr kill mkdosfs parted rsync shutdown sort ssh-keygen tr blockdev findfs insmod kexec lvm mdadm mke2fs pivot_root sshd swapon tune2fs pvcreate lvremove vgremove vgcreate lvcreate lvscan lvchange vgchange pvdisplay lvdisplay vgdisplay blkid dmsetup sfdisk # for sysclone dracut_install /lib/udev/rules.d/10-dm.rules dracut_install /lib/udev/rules.d/11-dm-lvm.rules dracut_install /lib/udev/rules.d/13-dm-disk.rules diff --git a/xCAT-genesis-builder/installkernel b/xCAT-genesis-builder/installkernel index c97915893..def199d90 100755 --- a/xCAT-genesis-builder/installkernel +++ b/xCAT-genesis-builder/installkernel @@ -1,13 +1,9 @@ #!/bin/bash instmods nfs sunrpc -instmods e1000 e1000e virtio_net virtio_pci igb ines sfc mlx4_en cxgb3 cxgb4 tg3 bnx2 bnx2x bna ixgb ixgbe qlge mptsas mpt2sas mpt3sas ata_piix megaraid_sas virtio_blk ahci ibmaem xhci-hcd sd_mod pmcraid be2net vfat ext3 ext4 btrfs reiserfs usb_storage scsi_wait_scan kvm kvm-intel kvm-amd ipmi_powernv ipmi_si ipmi_devintf qlcnic xfs +instmods e1000 e1000e virtio_net virtio_pci igb ines sfc mlx4_en cxgb3 cxgb4 tg3 bnx2 bnx2x bna ixgb ixgbe qlge mptsas mpt2sas mpt3sas ata_piix megaraid_sas virtio_blk ahci ibmaem xhci-hcd sd_mod pmcraid be2net vfat ext3 ext4 btrfs usb_storage scsi_wait_scan kvm kvm-intel kvm-amd ipmi_powernv ipmi_si ipmi_devintf qlcnic xfs instmods macvlan macvtap 8021q bridge bonding vmxnet3 cpufreq_ondemand acpi-cpufreq powernow-k8 cdc_ether instmods mptctl #LSI firmware management requires this instmods mlx4_ib ib_umad #make the mellanox ib available enough to examine /sys -instmods reiserfs #reiserfs on sysclone -instmods ibmveth # ppc64 virtual ethernet -instmods ibmvscsi # ppc64 virtual disk -instmods ehea # ppc64 hea ethernet instmods dm-mod #support LVM for sysclone instmods sg # Lenovo thinkserver firmware update support instmods ipr # IBM Power RAID diff --git a/xCAT-genesis-builder/xCAT-genesis-builder.spec b/xCAT-genesis-builder/xCAT-genesis-builder.spec index a8b1b30a2..ca8e27215 100644 --- a/xCAT-genesis-builder/xCAT-genesis-builder.spec +++ b/xCAT-genesis-builder/xCAT-genesis-builder.spec @@ -4,7 +4,7 @@ Version: %{?version:%{version}}%{!?version:%(cat Version)} Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")} 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 compat-libstdc++-33 mstflint xfsprogs nc Prefix: /opt/xcat AutoProv: false @@ -33,7 +33,9 @@ Genesis (Genesis Enhanced Netboot Environment for System Information and Servici rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/genesis/builder cd $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/genesis/builder -tar jxvf %{SOURCE0} +tar jxf %{SOURCE0} +sed -i s/%%REPLACE_CURRENT_VERSION%%/${Version}/g xCAT-genesis-base.spec + chmod +x $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/genesis/builder/buildrpm cd -