tools: renamed shw_ver to wrsw_version

The name was inconsistent with anything else, and we must simplify and get consistent. A symlink with the old name is provided. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

tools: renamed shw_ver to wrsw_version
The name was inconsistent with anything else, and we must simplify and get consistent. A symlink with the old name is provided. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
7011f7f8 · Alessandro Rubini · 1425cac7 · 7011f7f8 · 7011f7f8 · 7011f7f8
Commit 7011f7f8 authored Jul 29, 2014 by Alessandro Rubini
5 changed files
--- a/doc/wrs-build.in
+++ b/doc/wrs-build.in
@@ -1389,11 +1389,17 @@ The most important tools in @file{userspace/tools} are the following:
        to set host time as a first step, if @t{/wr/etc/wr_date.conf}
        exists and includes a line of the form @t{ntpserver 192.168.16.1}.

+@item wrs_version
+	Print information about the SW & HW version of the WRS. Please
+        check the help message.	See also @ref{DIP Switch HW version}.
+
 @item shw_ver
-	Print information about the SW & HW version of the WRS. 
-	See also @ref{DIP Switch HW version}.
+	A symbolic link to @t{wrs_version}, to be compatible with
+        older versions that used this tool name. The name is
+        inconsistent with anything else in the switch, so it is being
+        replaces.

-@item wrs_vlans
+@item wrsw_vlans
 	The tool allows to configure and unconfigure the VLAN settings
        for each port and for the RTU daemon. The @t{--help} option
        lists all configuration items of the tool.

--- a/userspace/rootfs_override/wr/bin/shw_ver
+++ b/userspace/rootfs_override/wr/bin/shw_ver
+wrsw_version
\ No newline at end of file
--- a/userspace/tools/.gitignore
+++ b/userspace/tools/.gitignore
@@ -7,7 +7,7 @@ wr_phytool
 com
 mapper
 wmapper
-shw_ver
+wrsw_version
 wr_date
 fix_tai_offset
 wr_management

--- a/userspace/tools/Makefile
+++ b/userspace/tools/Makefile
 TOOLS = rtu_stat wr_mon wr_phytool spll_dbg_proxy load-lm32 load-virtex com
-TOOLS += mapper wmapper shw_ver wr_date wr_management lm32-vuart wrsw_pstats
+TOOLS += mapper wmapper
+TOOLS += wrsw_version wr_date wr_management lm32-vuart wrsw_pstats
 TOOLS += wrsw_vlans

 # # Standard stanza for cross-compilation (courtesy of the linux makefile)
@@ -61,10 +62,11 @@ load-virtex: load-virtex.o load-fpga.o
 load-lm32: load-lm32.o lm32-loader.o
 	${CC} -o $@ $^ $(LDFLAGS)

-shw_ver.o: shw_ver.c
-	${CC} ${CFLAGS} -D__GIT_USR__="\"${GIT_USR}\"" -D__GIT_VER__="\"${GIT_VER}\"" $(LDFLAGS) -c -o $@ $^  
+wrsw_version.o: wrsw_version.c
+	${CC} ${CFLAGS} -D__GIT_USR__="\"${GIT_USR}\"" \
+		-D__GIT_VER__="\"${GIT_VER}\"" $(LDFLAGS) -c -o $@ $^  

-shw_ver: shw_ver.o
+wrsw_version: wrsw_version.o
 	${CC} -o $@ $^ $(LDFLAGS)	

 test_rt: test_rt.o ../wrsw_hal/rt_client.o

--- a/userspace/tools/shw_ver.c
+++ b/userspace/tools/shw_ver.c
 /*
- * shw_ver.c
+ * wrsw_version.c
 *
 * Obtain the HW version and FPGA type.
 *