Changeset b3d1e6a in rtems-libbsd


Ignore:
Timestamp:
Mar 21, 2018, 8:23:17 AM (14 months ago)
Author:
Christian Mauderer <christian.mauderer@…>
Branches:
5cb01f277962d3127d364bf871f799b34e6b6be6, cc60cbeef68291b54f73c2d26fe3da4b837a8e06
Children:
d300a34
Parents:
b2a210c
git-author:
Christian Mauderer <christian.mauderer@…> (03/21/18 08:23:17)
git-committer:
Christian Mauderer <christian.mauderer@…> (03/22/18 06:09:08)
Message:

config.inc: Remove unused values.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • config.inc

    rb2a210c rb3d1e6a  
    1 # Mandatory: Select your BSP and installation prefix
    2 TARGET = arm-rtems4.11
    3 BSP = realview_pbx_a9_qemu
    4 PREFIX = /opt/rtems-4.11
    5 
    6 # Optional: Separate installation base directory
    7 INSTALL_BASE = $(PREFIX)/$(TARGET)/$(BSP)
    8 
    9 # Optional: Network test configuration
    10 TEST_RUNNER = $(BSP)
    111NET_CFG_SELF_IP = 10.0.2.1
    122NET_CFG_NETMASK = 255.255.0.0
    133NET_CFG_PEER_IP = 192.168.100.11
    144NET_CFG_GATEWAY_IP = 192.168.100.11
    15 NET_TAP_INTERFACE = tap0
  • libbsd.txt

    rb2a210c rb3d1e6a  
    4343. Clone the Git repository +git clone git://git.rtems.org/rtems-libbsd.git+.
    4444. Change into the RTEMS BSD library root directory.
    45 . Edit the `config.inc` configuration file and adjust it to your environment.
     45. If you want to run tests with a custom IP configuration instead of the default
     46  one you can use an adjusted `config.inc` configuration file.
    4647. Run +waf configure ...+.
    4748. Run +waf+.
     
    120121to the README.waf file.
    121122
    122 ===== Example Configuration =====
    123 
    124 In the BSD library source directory edit the file `config.inc`.  Continuing on
    125 the above, the `config.inc` used to match the above is:
    126 
    127 -------------------------------------------------------------------------------
    128 # Mandatory: Select your BSP and installation prefix
    129 TARGET = arm-rtems4.12
    130 BSP = xilinx_zynq_a9_qemu
    131 PREFIX = $(HOME)/sandbox/install
    132 
    133 # Optional: Separate installation base directory
    134 INSTALL_BASE = $(PREFIX)/$(TARGET)/$(BSP)
    135 
    136 # Optional: Network test configuration
    137 TEST_RUNNER = $(BSP)
     123===== Example Configuration for Network Tests =====
     124
     125If you need some other IP configuration for the network tests that use a fixed
     126IP config you can copy `config.inc` to a location outside to the source tree and
     127adapt it. Then use the option `--net-test-config=NET_CONFIG` to pass the file to
     128waf's configure command.
     129
     130-------------------------------------------------------------------------------
    138131NET_CFG_SELF_IP = 10.0.0.2
    139132NET_CFG_NETMASK = 255.255.0.0
    140133NET_CFG_PEER_IP = 10.0.0.1
    141134NET_CFG_GATEWAY_IP = 10.0.0.1
    142 NET_TAP_INTERFACE = tap0
    143135-------------------------------------------------------------------------------
    144136
  • libbsd_waf.py

    rb2a210c rb3d1e6a  
    9999    net_cfg_peer_ip = None
    100100    net_cfg_gateway_ip = None
    101     net_tap_interface = None
    102101    try:
    103102        net_cfg_lines = open(bld.env.NET_CONFIG).readlines()
     
    121120            if lhs == "NET_CFG_GATEWAY_IP":
    122121                net_cfg_gateway_ip = rhs
    123             if lhs == "NET_TAP_INTERFACE":
    124                 net_tap_interface = rhs
    125122    bld(target = "testsuite/include/rtems/bsd/test/network-config.h",
    126123        source = "testsuite/include/rtems/bsd/test/network-config.h.in",
  • waf_generator.py

    rb2a210c rb3d1e6a  
    417417        self.add('    net_cfg_peer_ip = None')
    418418        self.add('    net_cfg_gateway_ip = None')
    419         self.add('    net_tap_interface = None')
    420419        self.add('    try:')
    421420        self.add('        net_cfg_lines = open(bld.env.NET_CONFIG).readlines()')
     
    440439        self.add('            if lhs == "NET_CFG_GATEWAY_IP":')
    441440        self.add('                net_cfg_gateway_ip = rhs')
    442         self.add('            if lhs == "NET_TAP_INTERFACE":')
    443         self.add('                net_tap_interface = rhs')
    444441        self.add('    bld(target = "testsuite/include/rtems/bsd/test/network-config.h",')
    445442        self.add('        source = "testsuite/include/rtems/bsd/test/network-config.h.in",')
Note: See TracChangeset for help on using the changeset viewer.