diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-06-13 09:18:14 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-06-13 09:18:14 +0200 |
| commit | 97bd5c48de49f1a25c6fb979f0ca151412fbd61b (patch) | |
| tree | 924b30812e7ae8d9d2f7c897b4ebbbf19802eff8 /doc | |
| parent | zebra: In which RTPROT_BABEL is hard (diff) | |
| parent | Merge pull request #679 from dslicenc/cm16513 (diff) | |
| download | frr-97bd5c48de49f1a25c6fb979f0ca151412fbd61b.tar.xz frr-97bd5c48de49f1a25c6fb979f0ca151412fbd61b.zip | |
Merge remote-tracking branch 'frr/master' into pull-624
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Building_FRR_on_Ubuntu1204.md | 7 | ||||
| -rw-r--r-- | doc/next-hop-tracking.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/Building_FRR_on_Ubuntu1204.md b/doc/Building_FRR_on_Ubuntu1204.md index 033e05bcd..e79614a57 100644 --- a/doc/Building_FRR_on_Ubuntu1204.md +++ b/doc/Building_FRR_on_Ubuntu1204.md @@ -13,7 +13,7 @@ Add packages: apt-get install git autoconf automake libtool make gawk libreadline-dev \ texinfo libpam0g-dev dejagnu libjson0-dev pkg-config libpam0g-dev \ - libjson0-dev flex python-pip libc-ares-dev python3-dev + libjson0-dev flex python-pip libc-ares-dev python3-dev libxml2 libxml2-dev Install newer bison from 14.04 package source (Ubuntu 12.04 package source is too old) @@ -51,6 +51,11 @@ Install newer version of autoconf and automake: sudo make install cd .. +Install XML::LibXML + + sudo cpan + install XML::LibXML + Install pytest: pip install pytest diff --git a/doc/next-hop-tracking.txt b/doc/next-hop-tracking.txt index d64433e2f..12ed63947 100644 --- a/doc/next-hop-tracking.txt +++ b/doc/next-hop-tracking.txt @@ -252,7 +252,7 @@ rnh table: struct rnh { u_char flags; - struct rib *state; + struct route_entry *state; struct list *client_list; struct route_node *node; }; |