userspace: fix wrsw_mrp, wrsw_mvrp, wrsw_snmpd and build them

This adds the three subdirecotries to the build, and fixes missing includes and libs by referring to ../ as needed. Now it looks like everything builds. After building, the following files remain in the source tree: patches/buildroot/0001-netsnmp-config-to-reduce-footprint.patch userspace/rootfs_override/etc/snmp/ userspace/rootfs_override/usr/ The first one is likely needed for building builroot, but this commit doesn't do anything about it. The other directories are stuff that should be installed: etc/snmp/snmpd.conf and usr/lib/{libieee8021{,q}bridge.so Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

userspace: fix wrsw_mrp, wrsw_mvrp, wrsw_snmpd and build them
This adds the three subdirecotries to the build, and fixes missing includes and libs by referring to ../ as needed. Now it looks like everything builds. After building, the following files remain in the source tree: patches/buildroot/0001-netsnmp-config-to-reduce-footprint.patch userspace/rootfs_override/etc/snmp/ userspace/rootfs_override/usr/ The first one is likely needed for building builroot, but this commit doesn't do anything about it. The other directories are stuff that should be installed: etc/snmp/snmpd.conf and usr/lib/{libieee8021{,q}bridge.so Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
dd84b427 · Alessandro Rubini · a3f7a321 · dd84b427 · dd84b427 · dd84b427
Commit dd84b427 authored Jun 19, 2014 by Alessandro Rubini
12 changed files
--- a/userspace/.gitignore
+++ b/userspace/.gitignore
 wrsw_hal/wrsw_hal
 wrsw_rtud/wrsw_rtud
+wr_mon/wr_mon
+wrsw_mrp/libwrmrp.so
+wrsw_mvrp/libwrmvrp.so
+wrsw_mvrp/wrsw_mvrpd
+wrsw_rtud/libwrrtu.so
+wrsw_snmpd/ieee8021Qbridge/libieee8021qbridge.so
+wrsw_snmpd/ieee8021bridge/libieee8021bridge.so
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -16,6 +16,9 @@ WRDEV_DIR ?= $(WRS_BASE_DIR)/..
 SUBDIRS = mini-rpc
 SUBDIRS += libswitchhw libwripc libptpnetif 
 SUBDIRS += wrsw_hal wrsw_rtud #spll_dbg_proxy
+SUBDIRS += wrsw_mrp
+SUBDIRS += wrsw_mvrp
+SUBDIRS += wrsw_snmpd
 SUBDIRS += wr_mon #rtu_stat

 # all variables are exported

--- a/userspace/wrsw_mrp/Makefile
+++ b/userspace/wrsw_mrp/Makefile
@@ -11,7 +11,7 @@ WR_LIB = $(WR_INSTALL_ROOT)/lib

 CFLAGS := -fPIC -shared -O2 -DDEBUG -Wall -ggdb -DTRACE_ALL \
         -I. -I../include -I../wrsw_rtud -I$(WR_INCLUDE) -I$(LINUX)/include \
-         -I../wrsw_hal
+         -I../wrsw_hal -I../libwripc

 LDFLAGS := -fPIC -shared -L. -L$(WR_LIB) -lrt -lwripc -lminipc -lwrrtu


--- a/userspace/wrsw_mvrp/Makefile.prg
+++ b/userspace/wrsw_mvrp/Makefile.prg
@@ -14,8 +14,8 @@ CFLAGS  := -O2 -DDEBUG -Wall -ggdb -DTRACE_ALL \
           -I. -I../include -I../wrsw_rtud -I../wrsw_mrp -I$(WR_INCLUDE) \
           -I$(LINUX)/include

-LDFLAGS := -L. -L$(WR_LIB) \
-           -lswitchhw -lwripc -lminipc -lwrrtu -lwrmrp
+LDFLAGS := -L. -L$(WR_LIB) -L../wrsw_mrp \
+           -lswitchhw -lwripc -lminipc -lwrrtu -lwrmrp -lm

 RM := rm -f


--- a/userspace/wrsw_snmpd/ieee8021Qbridge/Makefile
+++ b/userspace/wrsw_snmpd/ieee8021Qbridge/Makefile
@@ -13,7 +13,7 @@ CFLAGS = -fPIC -shared -I. -DV2 `$(NET-SNMP-CONFIG) --cflags` \


 LDFLAGS = -fPIC -shared `$(NET-SNMP-CONFIG) --ldflags` \
-          -L. -L$(WR_LIB) -lwrrtu -lwrmvrp
+          -L. -L$(WR_LIB) -L../../wrsw_mvrp -lwrrtu -lwrmvrp

 OBJS 	= \
 utils.o \

--- a/userspace/wrsw_snmpd/ieee8021bridge/Makefile
+++ b/userspace/wrsw_snmpd/ieee8021bridge/Makefile
@@ -14,7 +14,7 @@ WR_INSTALL_ROOT ?= /usr/lib/white-rabbit
 WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib

-LDFLAGS = -fPIC -shared -L. -lwripc `$(NET-SNMP-CONFIG) --ldflags`
+LDFLAGS = -fPIC -shared -L. -L../../libwripc -lwripc `$(NET-SNMP-CONFIG) --ldflags`


 OBJS =  $(IEEE8021BRIDGEBASETABLE)_data_get.o \
@@ -62,7 +62,7 @@ all:
 install: all
 	install -d $(ROOTFS_OVERRIDE)/usr/lib
 	install $(LIB) $(ROOTFS_OVERRIDE)/usr/lib
-	install libwripc.so $(ROOTFS_OVERRIDE)/usr/lib
+#	install libwripc.so $(ROOTFS_OVERRIDE)/usr/lib

 clean:
 	rm -f $(LIB) $(OBJS)

--- a/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgeBasePortTable/Makefile
+++ b/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgeBasePortTable/Makefile
@@ -8,7 +8,7 @@ WR_INSTALL_ROOT ?= /usr/lib/white-rabbit
 WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib

-CFLAGS 	= -fPIC -Wall -I. -I../../../wrsw_hal -I../../../../../build/ptp-noposix/libwripc `$(NET-SNMP-CONFIG) --cflags`
+CFLAGS 	= -fPIC -Wall -I. -I../../../wrsw_hal -I../../../libwripc `$(NET-SNMP-CONFIG) --cflags`

 OBJS =  ieee8021BridgeBasePortTable_data_get.o \
 	    ieee8021BridgeBasePortTable_data_set.o \

--- a/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgeBaseTable/Makefile
+++ b/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgeBaseTable/Makefile
@@ -8,7 +8,7 @@ WR_INSTALL_ROOT ?= /usr/lib/white-rabbit
 WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib

-CFLAGS 	= -fPIC -I. -I../../../wrsw_hal -I../../../../../build/ptp-noposix/libwripc `$(NET-SNMP-CONFIG) --cflags`
+CFLAGS 	= -fPIC -I. -I../../../wrsw_hal -I../../../libwripc `$(NET-SNMP-CONFIG) --cflags`

 OBJS =  ieee8021BridgeBaseTable_data_get.o \
 	    ieee8021BridgeBaseTable_data_set.o \

--- a/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgePortPriorityTable/Makefile
+++ b/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgePortPriorityTable/Makefile
@@ -8,7 +8,7 @@ WR_INSTALL_ROOT ?= /usr/lib/white-rabbit
 WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib

-CFLAGS 	= -fPIC -I. -I../../../wrsw_hal -I../../../../../build/ptp-noposix/libwripc `$(NET-SNMP-CONFIG) --cflags`
+CFLAGS 	= -fPIC -I. -I../../../wrsw_hal -I../../../libwripc `$(NET-SNMP-CONFIG) --cflags`

 OBJS =  ieee8021BridgePortPriorityTable_data_get.o \
 	    ieee8021BridgePortPriorityTable_data_set.o \

--- a/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgeTpPortTable/Makefile
+++ b/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgeTpPortTable/Makefile
@@ -8,7 +8,7 @@ WR_INSTALL_ROOT ?= /usr/lib/white-rabbit
 WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib

-CFLAGS 	= -fPIC -I. -I../../../wrsw_hal -I../../../../../build/ptp-noposix/libwripc `$(NET-SNMP-CONFIG) --cflags`
+CFLAGS 	= -fPIC -I. -I../../../wrsw_hal -I../../../libwripc `$(NET-SNMP-CONFIG) --cflags`

 OBJS =  ieee8021BridgeTpPortTable_data_get.o \
 	    ieee8021BridgeTpPortTable_data_set.o \

--- a/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgeTrafficClassTable/Makefile
+++ b/userspace/wrsw_snmpd/ieee8021bridge/ieee8021BridgeTrafficClassTable/Makefile
@@ -8,7 +8,7 @@ WR_INSTALL_ROOT ?= /usr/lib/white-rabbit
 WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib

-CFLAGS 	= -fPIC -I. -I../../../wrsw_hal -I../../../../../build/ptp-noposix/libwripc `$(NET-SNMP-CONFIG) --cflags`
+CFLAGS 	= -fPIC -I. -I../../../wrsw_hal -I../../../libwripc `$(NET-SNMP-CONFIG) --cflags`

 OBJS =  ieee8021BridgeTrafficClassTable_data_get.o \
 	    ieee8021BridgeTrafficClassTable_data_set.o \

--- a/userspace/wrsw_snmpd/ieee8021bridge/libwripc.so
+++ b/userspace/wrsw_snmpd/ieee8021bridge/libwripc.so