The main fix is for setting the value of NET_CFG_GATEWAY_IP which was getting set to the net mask value.

Others are _IP_IP instead of just _IP and look like typos. Otherwise, I don't think they cause a problem.

-gene
diff --git a/waf_generator.py b/waf_generator.py
index 0be3367..ff55031 100755
--- a/waf_generator.py
+++ b/waf_generator.py
@@ -367,9 +367,9 @@ class ModuleManager(builder.ModuleManager):
         self.add('                net_cfg_netmask = rhs')
         self.add('            if lhs == "NET_CFG_PEER_IP":')
         self.add('                net_cfg_peer_ip = rhs')
-        self.add('            if lhs == "NET_CFG_GATEWAY_IP_IP":')
+        self.add('            if lhs == "NET_CFG_GATEWAY_IP":')
         self.add('                net_cfg_gateway_ip = rhs')
-        self.add('            if lhs == "NET_TAP_INTERFACE_IP_IP":')
+        self.add('            if lhs == "NET_TAP_INTERFACE":')
         self.add('                net_tap_interface = rhs')
         self.add('    bld(target = "testsuite/include/rtems/bsd/test/network-config.h",')
         self.add('        source = "testsuite/include/rtems/bsd/test/network-config.h.in",')
@@ -377,7 +377,7 @@ class ModuleManager(builder.ModuleManager):
                  '-e \'s/@NET_CFG_NETMASK@/%s/\' ' + \
                  '-e \'s/@NET_CFG_PEER_IP@/%s/\' ' + \
                  '-e \'s/@NET_CFG_GATEWAY_IP@/%s/\' < ${SRC} > ${TGT}" % ' + \
-                 '(net_cfg_self_ip, net_cfg_netmask, net_cfg_peer_ip, net_cfg_netmask),')
+                 '(net_cfg_self_ip, net_cfg_netmask, net_cfg_peer_ip, net_cfg_gateway_ip),')
         self.add('        update_outputs = True)')
         self.add('')
 
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Reply via email to