Renaming binaries to avoid conflicts

PATCH In review Cyril Hrubis 1 participant 2 messages May 14, 2009 – May 18, 2009 1 message not in the archive

Share & tools

Cyril Hrubis

author

2009-05-14 20:46 UTC #0 lore raw

PATCH 1/1 Renaming binaries to avoid conflicts

Hi,
attached (against ltp-full-20090430.tgz) patch renames binaries in pan directory to have ltp- prefix as plain pan when installed in /usr/bin/ directory conflict with gnome pan. It also fixes all occurrences of pan in scripts and howtos.

Signature · 2 lines

Cyril Hrubis
[email protected]

ctcstools/ltp_wrapper.sh +7 -7

Index: ltp-full-20090430/ctcstools/ltp_wrapper.sh
===================================================================
@@ -59,30 +59,30 @@ elif [ `basename $0` == "ltp_wrapper.sh"
 fi;
 
 #eval $@
-eval pan -n $$ -a $$ -e -S -L -f $@ 
+eval ltp-pan -n $$ -a $$ -e -S -L -f $@ 
 rc=$?
  
 if [ $rc -eq 0 ]; then
-  echo "INFO: pan reported all tests PASS"
+  echo "INFO: ltp-pan reported all tests PASS"
   VALUE=0
 # LTP_MODE map unsuitable/unsupported tests to PASS. Check if _only_ TCONF is set!
 elif [ $LTP_MODE -eq 1 ] && [[ "$rc" -eq 4 ]]; then
-  echo "INFO: pan reported this test is unsuitable/unsupported (LTP_MODE)"
+  echo "INFO: ltp-pan reported this test is unsuitable/unsupported (LTP_MODE)"
   VALUE=0
 # LTP_MODE uses bit fields - TFAIL is 0x1
 elif [ $LTP_MODE -eq 1 ]  && [ "$(( $rc & 1 ))" -eq 0 ] ; then
-  echo "INFO: pan reported this test had INTERNAL ERRORS (LTP_MODE)"
+  echo "INFO: ltp-pan reported this test had INTERNAL ERRORS (LTP_MODE)"
   VALUE=2
 # OPENPOSIX_MODE map internal errors
 elif [ $OPENPOSIX_MODE -eq 1 ] && [[ "$rc" -eq 5 || "$rc" -eq "2" ]]; then
-  echo "INFO: pan reported this test had INTERNAL ERRORS (OPENPOSIX_MODE)"
+  echo "INFO: ltp-pan reported this test had INTERNAL ERRORS (OPENPOSIX_MODE)"
   VALUE=2
 # OPENPOSIX_MODE map unsuitable/unsupported tests to PASS
 elif [ $OPENPOSIX_MODE -eq 1 ] && [[ "$rc" -eq 4 ]]; then
-  echo "INFO: pan reported this test is unsuitable/unsupported (OPENPOSIX_MODE)"
+  echo "INFO: ltp-pan reported this test is unsuitable/unsupported (OPENPOSIX_MODE)"
   VALUE=0
 else
-  echo "INFO: pan reported some tests FAIL"
+  echo "INFO: ltp-pan reported some tests FAIL"
   VALUE=1
 fi

doc/automation-README.html +1 -1

Index: ltp-full-20090430/doc/automation-README.html
===================================================================
@@ -60,7 +60,7 @@ is unavailable.<br>
 options:</li>
    
   <ul>
-     <li>ex: <i>${LTPROOT}/pan/pan -l $PAN_LOG -e -S $instances $time -a
+     <li>ex: <i>${LTPROOT}/pan/ltp-pan -l $PAN_LOG -e -S $instances $time -a
 $$ -n $$ -f ${TMP}/alltests</i></li>
    
   </ul>

doc/automation-cookbook.html +1 -1

Index: ltp-full-20090430/doc/automation-cookbook.html
===================================================================
@@ -60,7 +60,7 @@ is unavailable.<br>
 options:</li>
    
   <ul>
-     <li>ex: <i>${LTPROOT}/pan/pan -l $PAN_LOG -e -S $instances $time -a
+     <li>ex: <i>${LTPROOT}/pan/ltp-pan -l $PAN_LOG -e -S $instances $time -a
 $$ -n $$ -f ${TMP}/alltests</i></li>
    
   </ul>

doc/ltp-howto.lyx +35 ~~-35~~

207 lines not on this page · raw message

doc/ltp-howto.txt +32 ~~-32~~

157 lines not on this page · raw message

doc/man1/Makefile +1 -1

Index: ltp-full-20090430/doc/man1/Makefile
===================================================================
@@ -1,7 +1,7 @@
 
 
 PREFIX=/usr
-MANPAGES=bump.1 doio.1 iogen.1 pan.1
+MANPAGES=ltp-bump.1 doio.1 iogen.1 ltp-pan.1
 
 all:

doc/man1/bump.1 deleted +0 ~~-80~~

80 lines not on this page · raw message

doc/man1/ltp-bump.1 new file +80 -0

80 lines not on this page · raw message

doc/man1/ltp-pan.1 new file +262 -0

262 lines not on this page · raw message

doc/man1/pan.1 deleted +0 ~~-262~~

262 lines not on this page · raw message

ltp-devel.spec +5 -5

Index: ltp-full-20090430/ltp-devel.spec
===================================================================
@@ -21,9 +21,9 @@ It is intended to be used to build testc
 %files
 /opt/ltp/lib/libltp.a
 /usr/share/pkgconfig/ltp.pc
-/opt/ltp/bin/pan
-/opt/ltp/bin/scanner
-/opt/ltp/bin/bump
+/opt/ltp/bin/ltp-pan
+/opt/ltp/bin/ltp-scanner
+/opt/ltp/bin/ltp-bump
 /opt/ltp/include/linux_syscall_numbers.h
 /opt/ltp/include/libtestsuite.h
 /opt/ltp/include/usctest.h

@@ -59,10 +59,10 @@ It is intended to be used to build testc
 /usr/share/man/man3/string_to_tokens.3
 /usr/share/man/man3/tst_sig.3
 /usr/share/man/man3/get_attrib.3
-/usr/share/man/man1/pan.1
+/usr/share/man/man1/ltp-pan.1
 /usr/share/man/man1/doio.1
 /usr/share/man/man1/iogen.1
-/usr/share/man/man1/bump.1
+/usr/share/man/man1/ltp-bump.1
 # Post-install stuff would go here.
 #EOF

pan/Makefile +9 -9

Index: ltp-full-20090430/pan/Makefile
===================================================================
@@ -4,21 +4,21 @@ LFLAGS += -l -w
 CFLAGS += -w 
 PREFIX = /opt/ltp
 
-all: pan bump scanner
+all: ltp-pan ltp-bump ltp-scanner
 
-pan: pan.o zoolib.o splitstr.o
+ltp-pan: ltp-pan.o zoolib.o splitstr.o
 
 
-bump: bump.o zoolib.o
+ltp-bump: ltp-bump.o zoolib.o
 
 
-scanner: scan.o scanner.o reporter.o tag_report.o symbol.o splitstr.o debug.o
+ltp-scanner: scan.o ltp-scanner.o reporter.o tag_report.o symbol.o splitstr.o debug.o
 
 
-install: pan bump scanner
-	install -D scanner $(DESTDIR)/$(PREFIX)/bin/scanner
-	install -D pan $(DESTDIR)/$(PREFIX)/bin/pan
-	install -D bump $(DESTDIR)/$(PREFIX)/bin/bump
+install: ltp-pan ltp-bump ltp-scanner
+	install -D ltp-scanner $(DESTDIR)/$(PREFIX)/bin/ltp-scanner
+	install -D ltp-pan $(DESTDIR)/$(PREFIX)/bin/ltp-pan
+	install -D ltp-bump $(DESTDIR)/$(PREFIX)/bin/ltp-bump
 
 clean:
-	rm -f *.o pan bump scanner
+	rm -f *.o ltp-pan ltp-bump ltp-scanner

pan/bump.c deleted +0 ~~-113~~

113 lines not on this page · raw message

pan/ltp-bump.c new file +113 -0

113 lines not on this page · raw message

pan/ltp-pan.c new file +1322 -0

1,322 lines not on this page · raw message

pan/ltp-scanner.c new file +183 -0

183 lines not on this page · raw message

pan/pan.c deleted +0 ~~-1322~~

106 lines not on this page · raw message

pan/scanner.c deleted +0 ~~-183~~

183 lines not on this page · raw message

runltp +7 -7

Index: ltp-full-20090430/runltp
===================================================================

Lines of this file are not shown. View the raw message.

runltplite.sh +6 -6

Index: ltp-full-20090430/runltplite.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/diskio.sh +3 -3

Index: ltp-full-20090430/testscripts/diskio.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/ltp-aiodio.sh +6 -6

Index: ltp-full-20090430/testscripts/ltp-aiodio.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/ltp-scsi_debug.sh +1 -1

Index: ltp-full-20090430/testscripts/ltp-scsi_debug.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/ltpfslvm.sh +2 -2

Index: ltp-full-20090430/testscripts/ltpfslvm.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/ltpfsnolvm.sh +2 -2

Index: ltp-full-20090430/testscripts/ltpfsnolvm.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/ltpstress.sh +5 -5

Index: ltp-full-20090430/testscripts/ltpstress.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/networkstress.sh +4 -4

Index: ltp-full-20090430/testscripts/networkstress.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/networktests.sh +4 -4

Index: ltp-full-20090430/testscripts/networktests.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/runEALtests.sh +3 -3

Index: ltp-full-20090430/testscripts/runEALtests.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/runpan.sh +3 -3

Index: ltp-full-20090430/testscripts/runpan.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/test_containers.sh +1 -1

Index: ltp-full-20090430/testscripts/test_containers.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/test_filecaps.sh +1 -1

Index: ltp-full-20090430/testscripts/test_filecaps.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/test_selinux.sh +1 -1

Index: ltp-full-20090430/testscripts/test_selinux.sh
===================================================================

Lines of this file are not shown. View the raw message.

testscripts/tpm_tools.sh +1 -1

Index: ltp-full-20090430/testscripts/tpm_tools.sh
===================================================================

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your production scanning environment may not be a perfect world - but thanks to Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700 Series Scanner you'll get full speed at 300 dpi even with all image processing features enabled. http://p.sf.net/sfu/kodak-com

_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Part of the diff is not shown here. View the raw message.

A message that is not in the archive (sent off-list or not yet received): [email protected]

Cyril Hrubis

author

2009-05-18 14:09 UTC #2 lore raw

Quoted 2 lines

Would not be easier to install it under another directory like /opt/bin if you also want to co-exist with Gnome pan?

Well there are at least two reasons to rename the binaries. Number one is package convetions, as all distributions have rules (and it's standartized by LSB) where to put some type of files in order not to mess you / filesystem. And even bigger problem is that you still need to call pan binary with absolute path, just because /usr/bin/ is most likely before /opt/bin/ in $PATH so calling plain pan could and will (if gnome-pan is installed) end up in running wrong binary.

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables 
unlimited royalty-free distribution of the report engine 
for externally facing server and web deployment. 
http://p.sf.net/sfu/businessobjects
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list