From 104af27bf283227a763245e057ec349e78dba4ea Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 16 Jan 2012 15:00:44 +0000 Subject: [PATCH] Update ldap to 6.2 locations (why they changed it I can't say...) Add mptctl for LSI firmware Add compat-libstdc++ rpm prereq to pull in broadcom required old stdc++ git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11388 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-nbroot2/install | 2 +- xCAT-nbroot2/installkernel | 1 + xCAT-nbroot2/xCAT-genesis-builder.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT-nbroot2/install b/xCAT-nbroot2/install index 22031a13b..ae6db5000 100755 --- a/xCAT-nbroot2/install +++ b/xCAT-nbroot2/install @@ -14,7 +14,7 @@ dracut_install chmod /lib/libc.so.6 /lib/ld-linux.so.2 /lib/libdl.so.2 /lib/libm dracut_install dmidecode /usr/lib64/libstdc++.so.6 #uxspi prereqs, but will use dmidecode to improve decision on loading ipmi_si dracut_install dmidecode /usr/lib64/libstdc++.so.5 #broadcom firmware update links against old lib dracut_install /lib/libpthread.so.0 #32 bit lib because UXSPI will not ship a native 64 bit build -dracut_install /usr/lib64/libldap-2.4.so.2 /usr/lib64/liblber-2.4.so.2 /usr/lib64/libsasl2.so.2 #uxspi has incurred these... +dracut_install /lib64/libldap-2.4.so.2 /lib64/liblber-2.4.so.2 /usr/lib64/libsasl2.so.2 #uxspi has incurred these... dracut_install /usr/share/zoneinfo/posix/Zulu dracut_install /usr/share/zoneinfo/posix/GMT-0 dracut_install /usr/share/zoneinfo/posix/Europe/Istanbul diff --git a/xCAT-nbroot2/installkernel b/xCAT-nbroot2/installkernel index 7a1c08dfc..3b37b5119 100755 --- a/xCAT-nbroot2/installkernel +++ b/xCAT-nbroot2/installkernel @@ -2,3 +2,4 @@ instmods nfs sunrpc instmods e1000 e1000e virtio_net igb ines mlx4_en cxgb3 cxgb4 bnx2 bnx2x bna ixgb qlge mptsas mpt2sas ata_piix megaraid_sas virtio_blk ahci ibmaem xhci-hcd sd_mod pmcraid be2net ext3 ext4 btrfs reiserfs usb_storage scsi_wait_scan kvm kvm-intel kvm-amd ipmi_si ipmi_devintf instmods macvlan macvtap 8021q bridge bonding vmxnet3 acpi-cpufreq powernow-k8 cdc_ether +instmods mptctl #LSI firmware management requires this diff --git a/xCAT-nbroot2/xCAT-genesis-builder.spec b/xCAT-nbroot2/xCAT-genesis-builder.spec index 5c3303c52..70e3d4e11 100644 --- a/xCAT-nbroot2/xCAT-genesis-builder.spec +++ b/xCAT-nbroot2/xCAT-genesis-builder.spec @@ -4,7 +4,7 @@ BuildArch: noarch Release: snap%(date +"%Y%m%d%H%M") Epoch: 1 AutoReq: false -Requires: ipmitool screen btrfs-progs lldpad rpm-build +Requires: ipmitool screen btrfs-progs lldpad rpm-build compat-libstdc++-33 Prefix: /opt/xcat AutoProv: false