From cc05e2710c3a6cf8b37477b79b1b2b294d9736a0 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Thu, 8 Oct 2009 22:26:16 +0000 Subject: [PATCH] Turned off some of the more verbose command echo's in the spec files so it is easier to spot errors git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4329 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/perl-xCAT.spec | 2 ++ xCAT-UI/xCAT-UI.spec | 2 ++ xCAT-client/xCAT-client.spec | 3 ++- xCAT-rmc/xCAT-rmc.spec | 2 ++ xCAT-server/xCAT-server.spec | 5 ++++- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/perl-xCAT.spec b/perl-xCAT/perl-xCAT.spec index 82cbb378d..2a2cea8ec 100644 --- a/perl-xCAT/perl-xCAT.spec +++ b/perl-xCAT/perl-xCAT.spec @@ -49,6 +49,7 @@ mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man5 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/man/man7 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man7 +set +x cp -r xCAT/* $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/ chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/* chmod 755 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/data @@ -69,6 +70,7 @@ cp share/man/man7/* $RPM_BUILD_ROOT/%{prefix}/share/man/man7 chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/man/man7/* cp share/doc/man7/* $RPM_BUILD_ROOT/%{prefix}/share/doc/man7 chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/doc/man7/* +set -x %clean # This step does not happen until *after* the %files packaging below diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec index add7eab14..6cd0b300a 100644 --- a/xCAT-UI/xCAT-UI.spec +++ b/xCAT-UI/xCAT-UI.spec @@ -35,8 +35,10 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{prefix}/ui +set +x cp -r * $RPM_BUILD_ROOT%{prefix}/ui chmod 755 $RPM_BUILD_ROOT%{prefix}/ui/* +set -x %files %defattr(-,root,root) diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec index 58c9d39a3..e5d336035 100644 --- a/xCAT-client/xCAT-client.spec +++ b/xCAT-client/xCAT-client.spec @@ -59,6 +59,7 @@ mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man3 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man5 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man8 +set +x %ifos linux mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/rvid cp share/xcat/rvid/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/rvid/ @@ -173,7 +174,7 @@ ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/sbin/mknb ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/mkhwconn ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rmhwconn ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/lshwconn - +set -x %clean diff --git a/xCAT-rmc/xCAT-rmc.spec b/xCAT-rmc/xCAT-rmc.spec index a0f8eaf9e..cd4b61877 100644 --- a/xCAT-rmc/xCAT-rmc.spec +++ b/xCAT-rmc/xCAT-rmc.spec @@ -36,11 +36,13 @@ mkdir -p $RPM_BUILD_ROOT/install/postscripts mkdir -p $RPM_BUILD_ROOT/install/postscripts/rmcmon/resources mkdir -p $RPM_BUILD_ROOT/install/postscripts/rmcmon/scripts +set +x cp plugin/* $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring cp -r resources $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/rmc cp scripts/* $RPM_BUILD_ROOT/%{prefix}/sbin/rmcmon chmod 755 $RPM_BUILD_ROOT/%{prefix}/sbin/rmcmon/* +set -x cp scripts/configrmcnode $RPM_BUILD_ROOT/install/postscripts chmod 755 $RPM_BUILD_ROOT/install/postscripts/configrmcnode diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index 17078b587..05164d7a9 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -50,6 +50,7 @@ mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/pcp mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT +set +x %ifos linux cp -a share/xcat/install/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/ cp -a share/xcat/netboot/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/ @@ -92,6 +93,7 @@ chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/* cp lib/perl/xCAT/* $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/* +set -x # For now, don't ship these plugins - to avoid AIX dependency on SNMP. %ifnos linux @@ -107,15 +109,16 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/vbox.pm cp lib/xcat/dsh/Context/* $RPM_BUILD_ROOT/opt/xcat/xdsh/Context chmod 644 $RPM_BUILD_ROOT/opt/xcat/xdsh/Context/* +set +x cp -r lib/xcat/monitoring/* $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/* +set -x chmod 755 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/samples chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/samples/* chmod 755 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/pcp chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/pcp/* - cp -r lib/xcat/schema/* $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/*