From 174bbc767b96bb5a9ce0a88972dd61a64bf1fe8d Mon Sep 17 00:00:00 2001 From: ertaozh Date: Wed, 11 Nov 2015 03:04:31 -0500 Subject: [PATCH] modify genesis-base version, add hwdb for lspci and udevadm --- xCAT-genesis-builder/buildrpm | 21 +++++---------------- xCAT-genesis-builder/install | 4 ++++ xCAT-genesis-builder/xCAT-genesis-base.spec | 4 +++- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm index 96e73af7a..b9a665cf3 100755 --- a/xCAT-genesis-builder/buildrpm +++ b/xCAT-genesis-builder/buildrpm @@ -5,18 +5,7 @@ # this whole dir into it somewhere (like /tmp). # Then run this script. The optional 1st arg should be mcp if you are building against mcp. -# Currently, *Fedora 22* is the only OS supported to build genesis-base for ppc64, and Centos 6.5 for x86_64 - - -# For building genesis-base based on Fedora 22 ppc64, the following steps are also needed before running this script -# -# 1. The Fedora 22 ppc64 can be installed either on pkvm VM or IBM Power S822LC machine. -# 2. Install ipmitool with yum install ipmitool. It will install the default ipmitool-1.8.13. -# 3. Download ipmitool-1.8.15 tar ball from https://sourceforge.net/projects/ipmitool/files/latest/download. -# 4. Install gcc -# 5. untar ipmitool-1.8.15 tar ball, cd into the top directory, then ./configure, make. -# The ipmitool-1.8.15 binary will be under ./src/. -# 6, replace /usr/bin/ipmitool with ./src/ipmitool +# Currently, *Fedora 23* is the only OS supported to build genesis-base for ppc64, and Centos 6.5 for x86_64 HOSTOS="$1" DIR=`dirname $0` @@ -118,12 +107,12 @@ elif [ $BUILDARCH = "ppc64" ]; then 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 22 ppc64 - sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.21.so/' $DRACUTMODDIR/install + # following changes are required on Fedora 23 ppc64 + sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.22.so/' $DRACUTMODDIR/install sed -i 's/\/lib\/libc.so.6/\/lib64\/libc.so.6/' $DRACUTMODDIR/install - # following changes are required on Fedora 22 ppc64 + # 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.21.so/' $DRACUTMODDIR/install + sed -i 's/\/lib\/ld-linux.so.2/\/lib64\/ld-2.22.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 diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install index 46e278201..db5c9fa01 100755 --- a/xCAT-genesis-builder/install +++ b/xCAT-genesis-builder/install @@ -623,4 +623,8 @@ dracut_install /lib/udev/rules.d/11-dm-lvm.rules dracut_install /lib/udev/rules.d/13-dm-disk.rules dracut_install /lib/udev/rules.d/69-dm-lvm-metad.rules dracut_install /lib/udev/rules.d/95-dm-notify.rules +# The DB files for lspci +dracut_install /usr/share/hwdata/pci.ids +# The DB files for udevadm +dracut_install /etc/udev/hwdb.bin dracut_install /lib64/libform.so.5 /lib64/libpanel.so.5 /lib64/libmenu.so.5 /lib64/libsysfs.so.2 /usr/sbin/iprconfig # iprconfig for IBM Power RAID configuration diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec index 17cf9c9b7..bb8e26795 100755 --- a/xCAT-genesis-builder/xCAT-genesis-base.spec +++ b/xCAT-genesis-builder/xCAT-genesis-base.spec @@ -1,4 +1,4 @@ -%define version 2.10 +%define version 2.11 %ifarch i386 i586 i686 x86 %define tarch x86 %endif @@ -13,6 +13,8 @@ BuildArch: noarch %define __spec_install_post : %define debug_package %{nil} %define __prelink_undo_cmd %{nil} +# To fix the issue error: Arch dependent binaries in noarch package, the following line is needed on Fedora 23 ppc64 +%define _binaries_in_noarch_packages_terminate_build 0 Release: snap%(date +"%Y%m%d%H%M") Epoch: 1 AutoReq: false