xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-23 11:40:25 +00:00
Code Issues Releases Wiki Activity

modify depending on comments

Browse Source
This commit is contained in:
hu-weihua
2016-07-03 23:29:51 -04:00
parent 4baac6278c
commit 3286d4a78d
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build-ubunturepo
View File

@@ -242,6 +242,10 @@ then
cd $file
dch -v $pkg_version -b -c debian/changelog $build_string
if [ "$target_arch" = "all" ]; then
#xcat probe use some functions shipped by xCAT, for below reasons we need to copy files to xCAT-probe directory
#1 make xcat probe code to be self-contained
#2 don't maintain two files for each script
#3 symbolic link can't work during package
if [ $file_low = "xcat-probe" ]; then
CURDIR=$(pwd)
mkdir -p ${CURDIR}/xCAT-probe/lib/perl/xCAT/

6
makerpm
View File

@@ -40,12 +40,18 @@ function makenoarch {
fi
fi
fi
#xcat probe use some functions shipped by xCAT, for below reasons we need to copy files to xCAT-probe directory
#1 make xcat probe code to be self-contained
#2 don't maintain two files for each script
#3 symbolic link can't work during package
if [ $RPMNAME = "xCAT-probe" ]; then
CURDIR=$(pwd)
mkdir -p ${CURDIR}/xCAT-probe/lib/perl/xCAT/
cp -f ${CURDIR}/perl-xCAT/xCAT/NetworkUtils.pm ${CURDIR}/xCAT-probe/lib/perl/xCAT/
cp -f ${CURDIR}/perl-xCAT/xCAT/GlobalDef.pm ${CURDIR}/xCAT-probe/lib/perl/xCAT/
fi
tar --exclude .svn -czf $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz $RPMNAME
rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm
rpmbuild $QUIET -ta $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz

4
xCAT-probe/debian/changelog
View File

@@ -1,5 +1,5 @@
xcat-probe (2.7) maverick; urgency=low
xcat-probe (2.12) xcat; urgency=low
* initial build
-- tonetto <tonetto@linux.vnet.ibm.com> Thu, 22 Sep 2011 19:42:58 -0300
-- huweihua <huweihua@cn.ibm.com> Fri, 1 Jul 2016 19:42:58 -0400

13
xCAT-probe/xCAT-probe.spec
View File

@@ -1,4 +1,4 @@
Summary: xCAT automated test tool
Summary: xCAT diagnostic tool
Name: xCAT-probe
Version: %(cat Version)
Release: snap%(date +"%Y%m%d%H%M")
@@ -12,7 +12,6 @@ Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Prefix: /opt/xcat
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
# AIX will build with an arch of "ppc"
%ifos linux
BuildArch: noarch
%endif
@@ -20,7 +19,7 @@ BuildArch: noarch
Provides: xCAT-probe = %{version}
%description
Provides a toolkits to help probe all the possible issues in xCAT
CAT-probe provides a toolkits to probe potential issues with the xCAT cluster.
%prep
%setup -q -n xCAT-probe
@@ -44,8 +43,8 @@ cp -r subcmds $RPM_BUILD_ROOT/%{prefix}/probe/
chmod 755 $RPM_BUILD_ROOT/%{prefix}/probe/subcmds/*
cp -r lib $RPM_BUILD_ROOT/%{prefix}/probe/
chmod 644 $RPM_BUILD_ROOT/%{prefix}/probe/lib/perl/*
chmod 644 $RPM_BUILD_ROOT/%{prefix}/probe/lib/perl/xCAT/*
chmod -R 644 $RPM_BUILD_ROOT/%{prefix}/probe/lib/perl/
chmod -R 644 $RPM_BUILD_ROOT/%{prefix}/probe/lib/perl/xCAT/
%clean
# This step does not happen until *after* the %files packaging below
@@ -58,8 +57,8 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}
%changelog
* Tue Sep 14 2010 - Airong Zheng <zhengar@us.ibm.com>
- "Create xCAT autotest package"
* Fri Jul 1 2016 - huweihu <huweihua@cn.ibm.com>
- "Create xCAT probe package"
%post