diff options
| author | Gene Smith <gds@chartertn.net> | 2015-06-24 01:04:51 -0400 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-06-26 14:07:03 +1000 |
| commit | 45a60417e81d98bf3132368d0d5980e7939264b2 (patch) | |
| tree | f7065d347fa03f83dc68490b1290be21b2bbee47 | |
| parent | condvar01: Initialize mutex (diff) | |
| download | rtems-libbsd-45a60417e81d98bf3132368d0d5980e7939264b2.tar.bz2 | |
modified: waf_generator.py Fix incorrect encoding of NET_CFG_GATEWAY_IP and change _IP_IP ending to _IP. Remove _IP_IP ending from NET_TAP_INTERFACE.
modified: wscript
Re-generated from "./freebsd-to-rtems -m" based on
waf_generator.py
| -rwxr-xr-x | waf_generator.py | 6 | ||||
| -rw-r--r-- | wscript | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/waf_generator.py b/waf_generator.py index 0be33676..ff550313 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('') @@ -128,13 +128,13 @@ def build(bld): net_cfg_netmask = rhs if lhs == "NET_CFG_PEER_IP": net_cfg_peer_ip = rhs - if lhs == "NET_CFG_GATEWAY_IP_IP": + if lhs == "NET_CFG_GATEWAY_IP": net_cfg_gateway_ip = rhs - if lhs == "NET_TAP_INTERFACE_IP_IP": + if lhs == "NET_TAP_INTERFACE": net_tap_interface = rhs bld(target = "testsuite/include/rtems/bsd/test/network-config.h", source = "testsuite/include/rtems/bsd/test/network-config.h.in", - rule = "sed -e 's/@NET_CFG_SELF_IP@/%s/' -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), + rule = "sed -e 's/@NET_CFG_SELF_IP@/%s/' -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_gateway_ip), update_outputs = True) # KVM Symbols |