Browse Source

upgrading package: tsmc 4.2.2.1 -> 5.1.5.2

Peter Smej 23 years ago
parent
commit
a5e2b6055d
3 changed files with 31 additions and 35 deletions
  1. 2 6
      tsmc/dsm.sys
  2. 10 17
      tsmc/dsmexec
  3. 19 12
      tsmc/tsmc.spec

+ 2 - 6
tsmc/dsm.sys

@@ -8,7 +8,7 @@ ServerName tsm.example.com
    TCPServerAddress    192.168.0.1
    TCPPort             1500
    TCPNoDelay          yes
-   PasswordAccess      prompt
+   PasswordAccess      generate
    NodeName            foo.example.com
 
    SchedLogName        @l_prefix@/var/tsmc/dsm.sched.log
@@ -17,11 +17,7 @@ ServerName tsm.example.com
    ErrorLogRetention   14 D
 
    SchedMode           prompted
-   ResourceUtilization 4
-   ChangingRetries     3
-   MaxCmdRetries       3
-   RetryPeriod         15
-   MemoryEff           yes
+   ResourceUtilization @resutil@
 
 *  VirtualMountPoint   @l_prefix@
 *  Domain              @l_prefix@

+ 10 - 17
tsmc/dsmexec

@@ -3,7 +3,9 @@
 ##  TSM Run-Time Executable Wrapper Script
 ##
 
-prog="`echo $0 | sed -e 's;.*/\([^/]*\)$;\1;'`"
+
+prog="dsmc"
+
 prefix="@l_prefix@"
 
 if [ ! -f "$prefix/libexec/tsmc/$prog" ]; then
@@ -11,26 +13,17 @@ if [ ! -f "$prefix/libexec/tsmc/$prog" ]; then
     exit 1
 fi
 
-DSM_CONFIG="$prefix/libexec/tsmc/dsm.opt"
-export DSM_CONFIG
 
 DSM_DIR="$prefix/libexec/tsmc"
 export DSM_DIR
 
-LD_LIBRARY_PATH=""
-for dir in /lib /usr/lib /usr/ccs/lib; do
-    if [ -d $dir ]; then
-        if [ ".$LD_LIBRARY_PATH" = . ]; then
-            LD_LIBRARY_PATH="$dir"
-        else
-            LD_LIBRARY_PATH="$dir:${LD_LIBRARY_PATH}"
-        fi
-    fi
-done
-if [ -d "$prefix/libexec/tsmc/lib" ]; then
-    LD_LIBRARY_PATH="$prefix/libexec/tsmc/lib:${LD_LIBRARY_PATH}"
-fi
-export LD_LIBRARY_PATH
+
+DSM_CONFIG="$prefix/libexec/tsmc/dsm.opt"
+export DSM_CONFIG
+
+
+LANG="en_US"
+export LANG
 
 exec $prefix/libexec/tsmc/$prog "$@"
 

+ 19 - 12
tsmc/tsmc.spec

@@ -32,12 +32,12 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [PRIV]
 Group:        Converter
 License:      Commercial
-Version:      4.2.2.1
+Version:      5.1.5.2
 Release:      20021122
 
 #   list of sources
-Source0:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/v4r2/Linux86/v4221/IP22508_1.tar
-Source1:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/v4r2/Solaris/v4221/IP22502_1.tar.Z
+Source0:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Linux/Linux86/v515/TIVsm-BA.i386.rpm
+Source1:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Solaris/v515/IP22545_2.tar.Z
 Source2:      dsmexec
 Source3:      dsm.sys
 Source4:      dsm.opt
@@ -46,14 +46,14 @@ Source5:      rc.tsmc
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021120
-PreReq:       OpenPKG, openpkg >= 20021120
+BuildPreReq:  OpenPKG, openpkg >= 20021009, tar, gzip
+PreReq:       OpenPKG, openpkg >= 20021009
 AutoReq:      no
 AutoReqProv:  no
 
 %description
     This is a stripped down version of the client part of the Tivoli
-    Storage Manager (TSM v4) software. It can be used to backup Solaris,
+    Storage Manager (TSM v5) software. It can be used to backup Solaris,
     Linux and FreeBSD machines to a TSM server.
 
 %prep
@@ -63,17 +63,19 @@ AutoReqProv:  no
     #   unpack the corresponding binary only
     case "%{l_target}" in
         *-freebsd* | *-linux* )
-            %{l_tar} xf %{SOURCE IP22508_1.tar}
+			 cp %{SOURCE  TIVsm-BA.i386.rpm} ./
             %{l_prefix}/bin/rpm2cpio TIVsm-BA.i386.rpm | cpio -idmu
             mv opt/tivoli/tsm/client root
             ;;
         *-solaris* )
-            %{l_gzip} -d -c %{SOURCE IP22502_1.tar.Z} | %{l_tar} xf -
+            %{l_prefix}/bin/gzip -d -c %{SOURCE IP22545_2.tar.Z} |\
+            %{l_prefix}/bin/tar xf -
             pkgtrans `pwd`/TIVsmCba.pkg `pwd` TIVsmCba
             mv TIVsmCba/reloc root
             ;;
     esac
 
+
 %install
     rm -rf $RPM_BUILD_ROOT
 
@@ -93,7 +95,7 @@ AutoReqProv:  no
         %{SOURCE dsmexec} $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/
 
     #   install binaries
-    for f in dsmagent dsmc dsmcad dsmstat dsmtca dsmadmc; do
+    for f in dsmadmc dsmagent dsmc dsmcad dsmtca ; do
         file="root/ba/bin/$f"
         if [ -f "root/admin/bin/$f" ]; then
             file="root/admin/bin/$f"
@@ -111,12 +113,17 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 644 \
         root/ba/bin/en_US/* \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US/DDsmResources.java >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US/wchelp.htl >/dev/null 2>&1 || true
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US/*.tif >/dev/null 2>&1 || true
 
+
+	# decide ResourceUtilisation for OS
+    case "%{l_target}" in
+        *-freebsd* ) l_resutil="1";;
+	    * ) l_resutil="2";; 
+	esac 
     #   install default configuration
     %{l_shtool} install -c -m 755 \
+		-e 's;@resutil@;'$l_resutil';g' \
         -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE dsm.opt} %{SOURCE dsm.sys} \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/
@@ -146,7 +153,7 @@ AutoReqProv:  no
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT
+#    rm -rf $RPM_BUILD_ROOT
 
 %post
     if [ $1 -eq 1 ]; then