Skip to content

Commit

Permalink
Merge pull request #1 from FRRouting/master
Browse files Browse the repository at this point in the history
updateing to latest FRRrouting
  • Loading branch information
diivious authored Sep 9, 2018
2 parents 9c42f07 + eac04cf commit 06db5af
Show file tree
Hide file tree
Showing 386 changed files with 11,648 additions and 9,047 deletions.
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
### How to submit an issue
Please use this text as a template and replace text in the sections or remove
the entire section if it does not apply to your issue. For example in case of
a question or feature request, just a description with some example is probably
fine. Also remember to use GitHub Flavored Markdown properly, especially if
posting output or code listings.

### Things you may try first
(put "x" in "[ ]" if you already tried following)
* [ ] Did you check if this is a duplicate issue?
* [ ] Did you test it on the latest FRRouting/frr master branch?

**Related Issue:**
[fill here if applicable]

### Description
[Description of the bug or feature]

### Steps to Reproduce
1. [First Step]
2. [Second Step]
3. [and so on...]

**Expected behavior:**
[What you expected to happen]

**Actual behavior:**
[What actually happened]

### Components
[bgpd, build, doc, isisd, ospfd, etc.]

### Versions
* OS: [name] [version]
* Kernel: [Linux/BSD] [version]
* FRR: [version]

### Attachments
[Attach if applicable. For example log-files, log-lines. etc. etc.]

You're also welcomed to provide us with any other data you think may be useful.

Thanks!
12 changes: 12 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
### Summary
[fill here]

### Related Issue
[fill here if applicable]

### Components
[bgpd, build, doc, ripd, ospfd, eigrpd, isisd, etc. etc.]

Always remember to follow proper coding style etc. as
described in the FRRouting Dev Guide.
http://docs.frrouting.org/projects/dev-guide/en/latest/workflow.html
132 changes: 66 additions & 66 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,87 +1,87 @@
compile
config.log
config.h
config.cache
config.status
config.guess
config.sub
ltmain.sh
stamp-h
stamp-h[0-9]*
### autoconf/automake root stuff

/compile
/config.log
/config.h
/config.cache
/config.status
/config.guess
/config.sub
/ltmain.sh
/stamp-h
/stamp-h[0-9]*
*-stamp
Makefile
INSTALL
/INSTALL
/depcomp
/missing
/install-sh
/mkinstalldirs
/ylwrap
/autom4te*.cache
/configure.lineno
/configure
/config.h.in
/confdefs.h
/conftest
/conftest.err
/aclocal.m4
/libtool

/Makefile
/Makefile.in

### autoconf/automake subdir stuff

.deps
depcomp
missing
install-sh
mkinstalldirs
ylwrap
autom4te*.cache
configure.lineno
configure
config.h.in
confdefs.h
conftest
conftest.err
aclocal.m4
Makefile.in
*.tar.gz
*.tar.gz.asc
.libs

### build outputs

*.o
*.lo
*.a
*.la
*.so
*.loT
*.pb.h
*.pb-c.h
*.pb-c.c
*_clippy.c

### dist

*.tar.?z
*.tar.?z.asc
*.tar.asc
*.deb
*.ddeb
*.dsc
*.changes

### other garbage

.nfs*
libtool
.libs
.arch-inventory
.arch-ids
{arch}
build
.cache
.msg
.rebase-*
*~
*.o
*.loT
m4/*.m4
!m4/ax_sys_weak_alias.m4
!m4/ax_compare_version.m4
!m4/ax_prog_perl_modules.m4
!m4/pkg.m4
debian/autoreconf.after
debian/autoreconf.before
debian/files
debian/frr-dbg.debhelper.log
debian/frr-dbg.substvars
debian/frr-dbg/
debian/frr-doc.debhelper.log
debian/frr-doc.substvars
debian/frr-doc/
debian/frr.debhelper.log
debian/frr.postinst.debhelper
debian/frr.postrm.debhelper
debian/frr.prerm.debhelper
debian/frr.substvars
debian/frr/
debian/tmp/
*.deb
*.ddeb
*.dsc
*.changes
*.pyc
*.bak
*.swp
*.pyc
__pycache__
*.patch
*.diff
cscope.*
*.pb.h
*.pb-c.h
*.pb-c.c
TAGS
tags
GTAGS
GSYMS
GRTAGS
GPATH
*.la
*.lo
compile_commands.json
.dirstamp

# clippy generated source
*_clippy.c
refix
129 changes: 111 additions & 18 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,13 +1,78 @@
## Process this file with automake to produce Makefile.in.

AUTOMAKE_OPTIONS = subdir-objects 1.12
include common.am
ACLOCAL_AMFLAGS = -I m4

AM_CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
-I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib
AM_CFLAGS = \
$(SAN_FLAGS) \
$(WERROR) \
# end
AM_CPPFLAGS = \
-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
-I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib
AM_LDFLAGS = \
-export-dynamic \
$(SAN_FLAGS) \
# end
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE)
LIBCAP = @LIBCAP@

# these two targets are provided to easily grab autoconf/Makefile variables
# you can use either:
# eval `make VARFD=3 shvar-CFLAGS 3>&1 1>&2`
# CFLAGS="`make VARFD=3 var-CFLAGS 3>&1 1>&2`"
# where the former can be used to set several variables at once. Note the
# fd redirections -- this is to prevent garbage from make rebuilding other
# targets from causing issues.
.PHONY: shvar-% var-%
VARFD ?= 1
shvar-%:
@echo "$*=\"$($*)\"" >&$(VARFD)
var-%:
@echo "$($*)" >&$(VARFD)

# overwriting these vars breaks cross-compilation. let's be helpful and warn.
#
# note: "#AUTODERP# " will be removed from Makefile by configure. These are
# GNU make directives & automake will f*ck them up by trying to process them
# as automake directives.
#
#AUTODERP# null=
#AUTODERP# SPACE=$(null) $(null)
#AUTODERP# mkcheck_CC = $(findstring $(SPACE)CC=, $(SPACE)$(MAKEOVERRIDES))
#AUTODERP# mkcheck_CFLAGS = $(findstring $(SPACE)CFLAGS=, $(SPACE)$(MAKEOVERRIDES))
#AUTODERP# mkcheck_CPPFLAGS = $(findstring $(SPACE)CPPFLAGS=,$(SPACE)$(MAKEOVERRIDES))
#AUTODERP# mkcheck_CCLD = $(findstring $(SPACE)CCLD=, $(SPACE)$(MAKEOVERRIDES))
#AUTODERP# mkcheck_LD = $(findstring $(SPACE)LD=, $(SPACE)$(MAKEOVERRIDES))
#AUTODERP# mkcheck_LDFLAGS = $(findstring $(SPACE)LDFLAGS=, $(SPACE)$(MAKEOVERRIDES))
#AUTODERP# #
#AUTODERP# ifneq ($(mkcheck_CC),)
#AUTODERP# $(warning WARNING: you have overwritten the "CC" variable on the make command line.)
#AUTODERP# endif
#AUTODERP# ifneq ($(mkcheck_CFLAGS),)
#AUTODERP# $(warning WARNING: you have overwritten the "CFLAGS" variable on the make command line.)
#AUTODERP# endif
#AUTODERP# ifneq ($(mkcheck_CPPFLAGS),)
#AUTODERP# $(warning WARNING: you have overwritten the "CPPFLAGS" variable on the make command line.)
#AUTODERP# endif
#AUTODERP# ifneq ($(mkcheck_CCLD),)
#AUTODERP# $(warning WARNING: you have overwritten the "CCLD" variable on the make command line.)
#AUTODERP# endif
#AUTODERP# ifneq ($(mkcheck_LD),)
#AUTODERP# $(warning WARNING: you have overwritten the "LD" variable on the make command line.)
#AUTODERP# endif
#AUTODERP# ifneq ($(mkcheck_LDFLAGS),)
#AUTODERP# $(warning WARNING: you have overwritten the "LDFLAGS" variable on the make command line.)
#AUTODERP# endif
#AUTODERP# #
#AUTODERP# ifneq ($(mkcheck_CC)$(mkcheck_CFLAGS)$(mkcheck_CPPFLAGS)$(mkcheck_CCLD)$(mkcheck_LD)$(mkcheck_LDFLAGS),)
#AUTODERP# $(warning ------)
#AUTODERP# $(warning While overwriting these variables works most of the time, it is not recommended and can cause confusing build errors.)
#AUTODERP# $(warning This is especially problematic when cross-compiling, since tools that run on the build system during the build process will not be compiled correctly.)
#AUTODERP# $(warning All of these variables should be supplied to 'configure', and they will be remembered and correctly applied during 'make'.)
#AUTODERP# $(warning ------)
#AUTODERP# endif

EXTRA_DIST =
BUILT_SOURCES =
CLEANFILES =
Expand All @@ -20,11 +85,14 @@ sbin_SCRIPTS =
noinst_PROGRAMS =
noinst_HEADERS =
noinst_LIBRARIES =
nodist_noinst_DATA =
lib_LTLIBRARIES =
module_LTLIBRARIES =
pkginclude_HEADERS =
nodist_pkginclude_HEADERS =
dist_examples_DATA =
man_MANS =
vtysh_scan =

## libtool, the self-made GNU scourge
## ... this should fix relinking
Expand All @@ -34,14 +102,23 @@ $(AUTOMAKE_DUMMY)install-moduleLTLIBRARIES: install-libLTLIBRARIES
$(AUTOMAKE_DUMMY)install-binPROGRAMS: install-libLTLIBRARIES
$(AUTOMAKE_DUMMY)install-sbinPROGRAMS: install-libLTLIBRARIES

include doc/subdir.am
include doc/user/subdir.am
include doc/manpages/subdir.am
include doc/developer/subdir.am
include include/subdir.am
include lib/subdir.am
include zebra/subdir.am
include watchfrr/subdir.am
include qpb/subdir.am
include fpm/subdir.am
include tools/subdir.am
include debianpkg/subdir.am
include solaris/subdir.am

include bgpd/subdir.am
include bgpd/rfp-example/librfp/subdir.am
include bgpd/rfp-example/rfptest/subdir.am
include ripd/subdir.am
include ripngd/subdir.am
include ospfd/subdir.am
Expand All @@ -58,17 +135,8 @@ include pbrd/subdir.am
include staticd/subdir.am
include bfdd/subdir.am

SUBDIRS = . @LIBRFP@ @RFPTEST@ \
@BGPD@ \
@VTYSH@ @DOC@ \
@SOLARIS@ tests

DIST_SUBDIRS = . bgpd \
vtysh doc tests \
solaris bgpd/rfp-example/librfp \
bgpd/rfp-example/rfptest \
debianpkg \
# end
include vtysh/subdir.am
include tests/subdir.am

if PKGSRC
rcdir=@pkgsrcrcdir@
Expand Down Expand Up @@ -106,12 +174,37 @@ EXTRA_DIST += \
snapcraft/helpers \
snapcraft/snap \
\
vtysh/Makefile.am \
vtysh/Makefile.in \
babeld/Makefile \
bgpd/Makefile \
bgpd/rfp-example/librfp/Makefile \
bgpd/rfp-example/rfptest/Makefile \
doc/Makefile \
doc/developer/Makefile \
doc/manpages/Makefile \
doc/user/Makefile \
eigrpd/Makefile \
fpm/Makefile \
isisd/Makefile \
ldpd/Makefile \
lib/Makefile \
nhrpd/Makefile \
ospf6d/Makefile \
ospfclient/Makefile \
ospfd/Makefile \
pbrd/Makefile \
pimd/Makefile \
ports/Makefile \
qpb/Makefile \
ripd/Makefile \
ripngd/Makefile \
staticd/Makefile \
tests/Makefile \
tools/Makefile \
vtysh/Makefile \
watchfrr/Makefile \
zebra/Makefile \
# end

ACLOCAL_AMFLAGS = -I m4

noinst_HEADERS += defaults.h

indent:
Expand Down
Loading

0 comments on commit 06db5af

Please sign in to comment.