Changeset 45a6041 in rtems-libbsd


Ignore:
Timestamp:
Jun 24, 2015, 5:04:51 AM (4 years ago)
Author:
Gene Smith <gds@…>
Branches:
4.11, 5283630d2c9d40deb0183696d278e02644fe4326, freebsd-9.3, bc2ba9a9cdc7381c2a4f2ae6ee303be636f31368
Children:
9ee5268
Parents:
b5cdb95
git-author:
Gene Smith <gds@…> (06/24/15 05:04:51)
git-committer:
Chris Johns <chrisj@…> (06/26/15 04:07:03)
Message:

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • waf_generator.py

    rb5cdb95 r45a6041  
    368368        self.add('            if lhs == "NET_CFG_PEER_IP":')
    369369        self.add('                net_cfg_peer_ip = rhs')
    370         self.add('            if lhs == "NET_CFG_GATEWAY_IP_IP":')
     370        self.add('            if lhs == "NET_CFG_GATEWAY_IP":')
    371371        self.add('                net_cfg_gateway_ip = rhs')
    372         self.add('            if lhs == "NET_TAP_INTERFACE_IP_IP":')
     372        self.add('            if lhs == "NET_TAP_INTERFACE":')
    373373        self.add('                net_tap_interface = rhs')
    374374        self.add('    bld(target = "testsuite/include/rtems/bsd/test/network-config.h",')
     
    378378                 '-e \'s/@NET_CFG_PEER_IP@/%s/\' ' + \
    379379                 '-e \'s/@NET_CFG_GATEWAY_IP@/%s/\' < ${SRC} > ${TGT}" % ' + \
    380                  '(net_cfg_self_ip, net_cfg_netmask, net_cfg_peer_ip, net_cfg_netmask),')
     380                 '(net_cfg_self_ip, net_cfg_netmask, net_cfg_peer_ip, net_cfg_gateway_ip),')
    381381        self.add('        update_outputs = True)')
    382382        self.add('')
  • wscript

    rb5cdb95 r45a6041  
    129129            if lhs == "NET_CFG_PEER_IP":
    130130                net_cfg_peer_ip = rhs
    131             if lhs == "NET_CFG_GATEWAY_IP_IP":
     131            if lhs == "NET_CFG_GATEWAY_IP":
    132132                net_cfg_gateway_ip = rhs
    133             if lhs == "NET_TAP_INTERFACE_IP_IP":
     133            if lhs == "NET_TAP_INTERFACE":
    134134                net_tap_interface = rhs
    135135    bld(target = "testsuite/include/rtems/bsd/test/network-config.h",
    136136        source = "testsuite/include/rtems/bsd/test/network-config.h.in",
    137         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),
     137        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),
    138138        update_outputs = True)
    139139
Note: See TracChangeset for help on using the changeset viewer.