Changeset 5315d35 in rtems-libbsd


Ignore:
Timestamp:
Dec 20, 2013, 9:14:26 AM (5 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 647dd08ae2aa69b935c2847ea450fb824322ecae, freebsd-9.3, c6261f97870562d4c797cfb1ff1ba0affb85a916
Children:
f5a38ad
Parents:
25d028c
git-author:
Sebastian Huber <sebastian.huber@…> (12/20/13 09:14:26)
git-committer:
Sebastian Huber <sebastian.huber@…> (12/20/13 10:22:26)
Message:

Always enable IPv6

Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • .gitignore

    r25d028c r5315d35  
    1414freebsd/lib/libc/net/nsparser.c
    1515rtemsbsd/rtems/rtems-kvm-symbols.c
    16 rtemsbsd/include/machine/rtems-bsd-kernel-space.h
    1716testsuite/include/rtems/bsd/test/network-config.h
    1817/*.i
  • Makefile

    r25d028c r5315d35  
    2929NEED_DUMMY_PIC_IRQ=yes
    3030
    31 # do nothing default so sed on rtems-bsd-kernel-space.h always works.
    32 SED_PATTERN += -e 's/^//'
    33 
    3431TEST_NETWORK_CONFIG = testsuite/include/rtems/bsd/test/network-config.h
    3532
     
    4441
    4542LIB = libbsd.a
    46 LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-kernel-space.h
     43LIB_GEN_FILES =
    4744LIB_C_FILES =
    4845LIB_C_FILES += rtemsbsd/local/bus_if.c
     
    295292LIB_C_FILES += freebsd/sys/netinet/libalias/alias_skinny.c
    296293LIB_C_FILES += freebsd/sys/netinet/libalias/alias_sctp.c
    297 ifneq ($(DISABLE_IPV6),yes)
    298294LIB_C_FILES += freebsd/sys/net/if_stf.c
    299295LIB_C_FILES += freebsd/sys/netinet6/dest6.c
     
    324320LIB_C_FILES += freebsd/sys/netinet6/sctp6_usrreq.c
    325321LIB_C_FILES += freebsd/sys/netinet6/udp6_usrreq.c
    326 else
    327 SED_PATTERN += -e 's/^\#define INET6 1/\/\/ \#define INET6 1/'
    328 endif # DISABLE_IPV6
    329322LIB_C_FILES += freebsd/sys/netipsec/ipsec.c
    330323LIB_C_FILES += freebsd/sys/netipsec/ipsec_input.c
     
    13111304        < $< > $@
    13121305
    1313 # The following targets use the MIPS Generic in_cksum routine
    1314 rtemsbsd/include/machine/rtems-bsd-kernel-space.h: rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in
    1315         sed $(SED_PATTERN) <$< >$@
    1316 
    13171306CPU_SED  = sed
    13181307CPU_SED += -e '/arm/d'
  • config.inc

    r25d028c r5315d35  
    22RTEMS_MAKEFILE_PATH = ${HOME}/newbsd/bsp-install/mips-rtems4.11/$(BSP)
    33INSTALL_BASE = ${HOME}/newbsd/install
    4 DISABLE_IPV6=no
    54TEST_RUNNER = $(BSP)
    65NET_CFG_SELF_IP = 10.0.2.1
  • freebsd-to-rtems.py

    r25d028c r5315d35  
    435435                        'NEED_DUMMY_PIC_IRQ=yes\n' \
    436436                        '\n' \
    437                         '# do nothing default so sed on rtems-bsd-kernel-space.h always works.\n' \
    438                         'SED_PATTERN += -e \'s/^//\'\n' \
    439                         '\n' \
    440437                        'TEST_NETWORK_CONFIG = testsuite/include/rtems/bsd/test/network-config.h\n' \
    441438                        '\n' \
     
    450447                        '\n' \
    451448                        'LIB = libbsd.a\n' \
    452                         'LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-kernel-space.h\n' \
     449                        'LIB_GEN_FILES =\n' \
    453450                        'LIB_C_FILES =\n'
    454451                for m in self.modules:
     
    466463                                data += 'endif\n'
    467464                        if m.conditionalOn != "none":
    468                                 data += 'else\n'
    469                                 data += 'SED_PATTERN += -e \'' + m.cppPattern +'\'\n'
    470465                                data += 'endif # ' + m.conditionalOn +'\n'
    471466                data += '\n' \
     
    496491                        '\t-e \'s/@NET_CFG_GATEWAY_IP@/$(NET_CFG_GATEWAY_IP)/\' \\\n' \
    497492                        '\t< $< > $@\n' \
    498                         '\n' \
    499                         '# The following targets use the MIPS Generic in_cksum routine\n' \
    500                         'rtemsbsd/include/machine/rtems-bsd-kernel-space.h: rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in\n' \
    501                         '\tsed $(SED_PATTERN) <$< >$@\n' \
    502493                        '\n' \
    503494                        'CPU_SED  = sed\n' \
     
    561552                self.name = name
    562553                self.conditionalOn = "none"
    563                 self.cppPattern = "s///"
    564554                self.files = []
    565555                self.cpuDependentSourceFiles = {}
     
    17121702
    17131703netinet6 = Module('netinet6')
    1714 netinet6.conditionalOn = "DISABLE_IPV6"
    1715 netinet6.cppPattern = 's/^\#define INET6 1/\/\/ \#define INET6 1/'
    17161704netinet6.addKernelSpaceHeaderFiles(
    17171705        [
Note: See TracChangeset for help on using the changeset viewer.