From 072e9d80fec28ef6b9b51b155c8d4147aca0e14a Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 30 Nov 2007 15:38:30 +0000 Subject: [PATCH] Tree changes for relocation capability git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@107 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-client-2.0/{usr => }/bin/getnodecfg | 0 xCAT-client-2.0/{usr => }/bin/pping | 0 xCAT-client-2.0/{usr => }/bin/psh | 0 xCAT-client-2.0/{usr => }/bin/xcatDBcmds | 0 xCAT-client-2.0/{usr => }/bin/xcatclient | 0 xCAT-client-2.0/{usr => }/bin/xcatclientnnr | 0 xCAT-client-2.0/{usr => }/bin/xcoll | 0 xCAT-client-2.0/{usr => }/bin/xdsh | 0 xCAT-client-2.0/{usr => }/sbin/tabedit | 0 xCAT-client-2.0/{usr => }/sbin/tabrestore | 0 xCAT-client-2.0/xCAT-client.spec | 96 ++++++++++----------- 11 files changed, 47 insertions(+), 49 deletions(-) rename xCAT-client-2.0/{usr => }/bin/getnodecfg (100%) rename xCAT-client-2.0/{usr => }/bin/pping (100%) rename xCAT-client-2.0/{usr => }/bin/psh (100%) rename xCAT-client-2.0/{usr => }/bin/xcatDBcmds (100%) rename xCAT-client-2.0/{usr => }/bin/xcatclient (100%) rename xCAT-client-2.0/{usr => }/bin/xcatclientnnr (100%) rename xCAT-client-2.0/{usr => }/bin/xcoll (100%) rename xCAT-client-2.0/{usr => }/bin/xdsh (100%) rename xCAT-client-2.0/{usr => }/sbin/tabedit (100%) rename xCAT-client-2.0/{usr => }/sbin/tabrestore (100%) diff --git a/xCAT-client-2.0/usr/bin/getnodecfg b/xCAT-client-2.0/bin/getnodecfg similarity index 100% rename from xCAT-client-2.0/usr/bin/getnodecfg rename to xCAT-client-2.0/bin/getnodecfg diff --git a/xCAT-client-2.0/usr/bin/pping b/xCAT-client-2.0/bin/pping similarity index 100% rename from xCAT-client-2.0/usr/bin/pping rename to xCAT-client-2.0/bin/pping diff --git a/xCAT-client-2.0/usr/bin/psh b/xCAT-client-2.0/bin/psh similarity index 100% rename from xCAT-client-2.0/usr/bin/psh rename to xCAT-client-2.0/bin/psh diff --git a/xCAT-client-2.0/usr/bin/xcatDBcmds b/xCAT-client-2.0/bin/xcatDBcmds similarity index 100% rename from xCAT-client-2.0/usr/bin/xcatDBcmds rename to xCAT-client-2.0/bin/xcatDBcmds diff --git a/xCAT-client-2.0/usr/bin/xcatclient b/xCAT-client-2.0/bin/xcatclient similarity index 100% rename from xCAT-client-2.0/usr/bin/xcatclient rename to xCAT-client-2.0/bin/xcatclient diff --git a/xCAT-client-2.0/usr/bin/xcatclientnnr b/xCAT-client-2.0/bin/xcatclientnnr similarity index 100% rename from xCAT-client-2.0/usr/bin/xcatclientnnr rename to xCAT-client-2.0/bin/xcatclientnnr diff --git a/xCAT-client-2.0/usr/bin/xcoll b/xCAT-client-2.0/bin/xcoll similarity index 100% rename from xCAT-client-2.0/usr/bin/xcoll rename to xCAT-client-2.0/bin/xcoll diff --git a/xCAT-client-2.0/usr/bin/xdsh b/xCAT-client-2.0/bin/xdsh similarity index 100% rename from xCAT-client-2.0/usr/bin/xdsh rename to xCAT-client-2.0/bin/xdsh diff --git a/xCAT-client-2.0/usr/sbin/tabedit b/xCAT-client-2.0/sbin/tabedit similarity index 100% rename from xCAT-client-2.0/usr/sbin/tabedit rename to xCAT-client-2.0/sbin/tabedit diff --git a/xCAT-client-2.0/usr/sbin/tabrestore b/xCAT-client-2.0/sbin/tabrestore similarity index 100% rename from xCAT-client-2.0/usr/sbin/tabrestore rename to xCAT-client-2.0/sbin/tabrestore diff --git a/xCAT-client-2.0/xCAT-client.spec b/xCAT-client-2.0/xCAT-client.spec index 66390a413..9b4fb531e 100644 --- a/xCAT-client-2.0/xCAT-client.spec +++ b/xCAT-client-2.0/xCAT-client.spec @@ -8,7 +8,7 @@ Source: xCAT-client-2.0.tar.gz Packager: IBM Corp. Vendor: IBM Corp. Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} -Prefix: %{_prefix} +Prefix: /usr BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root # AIX will build with an arch of "ppc" @@ -28,56 +28,56 @@ xCAT-client provides the fundamental xCAT commands (chtab, chnode, rpower, etc) rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/share/xcat/scripts +mkdir -p $RPM_BUILD_ROOT/%{prefix}/bin +mkdir -p $RPM_BUILD_ROOT/%{prefix}/sbin +mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/scripts -cp usr/bin/* $RPM_BUILD_ROOT/usr/bin -chmod 755 $RPM_BUILD_ROOT/usr/bin/* -cp usr/sbin/* $RPM_BUILD_ROOT/usr/sbin -chmod 755 $RPM_BUILD_ROOT/usr/sbin/* +cp bin/* $RPM_BUILD_ROOT/%{prefix}/bin +chmod 755 $RPM_BUILD_ROOT/%{prefix}/bin/* +cp sbin/* $RPM_BUILD_ROOT/%{prefix}/sbin +chmod 755 $RPM_BUILD_ROOT/%{prefix}/sbin/* #cp usr/share/xcat/scripts/setup-local-client.sh $RPM_BUILD_ROOT/usr/share/xcat/scripts/setup-local-client.sh #chmod 755 $RPM_BUILD_ROOT/usr/share/xcat/scripts/setup-local-client.sh -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rpower -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rscan -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/sbin/makedhcp -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/sbin/makehosts -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/sbin/nodeset -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/sbin/makeconservercf -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rbeacon -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rvitals -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rinv -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rspreset -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rsetboot -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rbootseq -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/reventlog -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/nodels -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/nodech -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/noderm -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rnetboot -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/getmacs -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/mkvm -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/rmvm -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/lsvm -ln -sf /usr/bin/xcatclient $RPM_BUILD_ROOT/usr/bin/chvm -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/sbin/tabdump -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/sbin/makedns -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/bin/gettab -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/sbin/nodeadd -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/sbin/makenetworks -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/sbin/copycds -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/bin/regnotif -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/bin/unregnotif -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/bin/startmon -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/bin/stopmon -ln -sf /usr/bin/xcatclientnnr $RPM_BUILD_ROOT/usr/bin/updatemon -ln -sf /usr/bin/xcatDBcmds $RPM_BUILD_ROOT/usr/bin/mkdef -ln -sf /usr/bin/xcatDBcmds $RPM_BUILD_ROOT/usr/bin/chdef -ln -sf /usr/bin/xcatDBcmds $RPM_BUILD_ROOT/usr/bin/lsdef -ln -sf /usr/bin/xcatDBcmds $RPM_BUILD_ROOT/usr/bin/rmdef -ln -sf /usr/bin/xdsh $RPM_BUILD_ROOT/usr/bin/xdcp +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rpower +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rscan +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/sbin/makedhcp +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/sbin/makehosts +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/sbin/nodeset +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/sbin/makeconservercf +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rbeacon +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rvitals +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rinv +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rspreset +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rsetboot +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rbootseq +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/reventlog +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/nodels +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/nodech +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/noderm +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rnetboot +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/getmacs +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/mkvm +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rmvm +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/lsvm +ln -sf %{prefix}/bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/chvm +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/sbin/tabdump +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/sbin/makedns +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/gettab +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/sbin/nodeadd +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/sbin/makenetworks +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/sbin/copycds +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/regnotif +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/unregnotif +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/startmon +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/stopmon +ln -sf %{prefix}/bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/updatemon +ln -sf %{prefix}/bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/mkdef +ln -sf %{prefix}/bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/chdef +ln -sf %{prefix}/bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/lsdef +ln -sf %{prefix}/bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/rmdef +ln -sf %{prefix}/bin/xdsh $RPM_BUILD_ROOT/%{prefix}/bin/xdcp %clean rm -rf $RPM_BUILD_ROOT @@ -86,9 +86,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc README %doc LICENSE.html -/usr/bin/* -/usr/sbin/* -#/usr/share/xcat/scripts/setup-local-client.sh +%{prefix} %changelog * Wed May 2 2007 - Norm Nott