From ce5ad6f52651b739c83c2cbbb8d2ccaeb4deeeb0 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Fri, 16 Jun 2017 04:38:33 -0400 Subject: [PATCH] Remove the commented out lines to not have the reviewer confusing --- xCAT-genesis-builder/buildrpm | 24 ------------------------ xCAT-genesis-builder/install | 4 ---- 2 files changed, 28 deletions(-) diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm index 25a37c743..28f3985aa 100755 --- a/xCAT-genesis-builder/buildrpm +++ b/xCAT-genesis-builder/buildrpm @@ -135,30 +135,6 @@ if [ "$HOSTOS" = "mcp" ]; then elif [ $BUILDARCH = "ppc64" ]; then sed -i 's/ efibootmgr//' $DRACUTMODDIR/install sed -i 's/ dmidecode//' $DRACUTMODDIR/install - # Remove the libraries with special version number, starting from Fedora 26 Alpha ppc64 - # ========================================================== - #sed -i 's/\/lib\/libncurses.so.5.7/\/lib64\/libncurses.so.5.7/' $DRACUTMODDIR/install - #sed -i 's/\/usr\/lib\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.13/' $DRACUTMODDIR/install - #sed -i 's/\/lib\/libgcc_s.so.1/\/lib64\/libgcc_s.so.1/' $DRACUTMODDIR/install - #sed -i 's/\/lib\/libtinfo.so.5.7/\/lib64\/libtinfo.so.5.7/' $DRACUTMODDIR/install - # following changes are required on Fedora 20 ppc64 - # sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.18.so/' $DRACUTMODDIR/install - # following changes are required on Fedora 26 Alpha ppc64 - #sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.25.so/' $DRACUTMODDIR/install - #sed -i 's/\/lib\/libc.so.6/\/lib64\/libc.so.6/' $DRACUTMODDIR/install - # following changes are required on Fedora 23 ppc64 - #sed -i 's/\/lib\/ld-linux.so.2/\/lib64\/ld-2.18.so/' $DRACUTMODDIR/install - #sed -i 's/\/lib\/ld-linux.so.2/\/lib64\/ld-2.25.so/' $DRACUTMODDIR/install - #sed -i 's/\/lib\/libdl.so.2/\/lib64\/libdl.so.2/' $DRACUTMODDIR/install - #sed -i 's/\/lib\/libm.so.6/\/lib64\/libm.so.6/' $DRACUTMODDIR/install - #sed -i 's/\/lib\/libpthread.so.0/\/lib64\/libpthread.so.0/' $DRACUTMODDIR/install - #sed -i 's/\/lib64\/libncurses.so.5.7/\/lib64\/libncurses.so.6.0/' $DRACUTMODDIR/install - #sed -i 's/\/usr\/lib64\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.19/' $DRACUTMODDIR/install - #sed -i 's/\/usr\/lib64\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.23/' $DRACUTMODDIR/install - #sed -i 's/\/lib64\/libtinfo.so.5.7/\/lib64\/libtinfo.so.6.0/' $DRACUTMODDIR/install - #sed -i 's/\/usr\/lib64\/libsasl2.so.2/\/usr\/lib64\/libsasl2.so.3/' $DRACUTMODDIR/install - #sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.18.so/' $DRACUTMODDIR/install - # ========================================================== sed -i 's/\/lib\/terminfo\/l\/linux/\/usr\/share\/terminfo\/l\/linux/g' $DRACUTMODDIR/install sed -i 's/\/lib\/terminfo\/v\/vt100/\/usr\/share\/terminfo\/v\/vt100/g' $DRACUTMODDIR/install fi diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install index 36ee6207b..e5dfbe0f0 100755 --- a/xCAT-genesis-builder/install +++ b/xCAT-genesis-builder/install @@ -11,10 +11,6 @@ dracut_install poweroff ntpq ntpd ntp-wait hwclock date /usr/share/terminfo/x/xt dracut_install /sbin/rsyslogd /etc/protocols umount /bin/rpm /usr/lib/rpm/rpmrc dracut_install chmod /sbin/route /sbin/ifconfig /usr/bin/whoami /usr/bin/head /usr/bin/tail basename /etc/redhat-release ping tr lsusb /usr/share/hwdata/usb.ids #ibm fw wrapper requirements dracut_install efibootmgr lldptool dmidecode #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 /lib/libncurses.so.5.7 /usr/lib/libstdc++.so.6.0.13 /lib/libgcc_s.so.1 /lib/libtinfo.so.5.7 -#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