From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] quagga: version bump 0.99.23 -> 1.2.4
Date: Mon, 7 May 2018 18:46:37 +0200 [thread overview]
Message-ID: <20180507164637.GA29133@lenoch> (raw)
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
projectroot/etc/babeld.conf | 30 -------------
projectroot/etc/{ => quagga}/bgpd.conf | 0
projectroot/etc/quagga/isisd.conf | 39 +++++++++++++++++
projectroot/etc/quagga/nhrpd.conf | 1 +
projectroot/etc/{ => quagga}/ospf6d.conf | 0
projectroot/etc/{ => quagga}/ospfd.conf | 0
projectroot/etc/quagga/pimd.conf | 41 ++++++++++++++++++
projectroot/etc/{ => quagga}/ripd.conf | 0
projectroot/etc/{ => quagga}/ripngd.conf | 0
projectroot/etc/{ => quagga}/vtysh.conf | 0
projectroot/etc/{ => quagga}/zebra.conf | 0
rules/quagga.in | 28 ++++++++++--
rules/quagga.make | 54 +++++++++++++-----------
13 files changed, 136 insertions(+), 57 deletions(-)
delete mode 100644 projectroot/etc/babeld.conf
rename projectroot/etc/{ => quagga}/bgpd.conf (100%)
create mode 100644 projectroot/etc/quagga/isisd.conf
create mode 100644 projectroot/etc/quagga/nhrpd.conf
rename projectroot/etc/{ => quagga}/ospf6d.conf (100%)
rename projectroot/etc/{ => quagga}/ospfd.conf (100%)
create mode 100644 projectroot/etc/quagga/pimd.conf
rename projectroot/etc/{ => quagga}/ripd.conf (100%)
rename projectroot/etc/{ => quagga}/ripngd.conf (100%)
rename projectroot/etc/{ => quagga}/vtysh.conf (100%)
rename projectroot/etc/{ => quagga}/zebra.conf (100%)
diff --git a/projectroot/etc/babeld.conf b/projectroot/etc/babeld.conf
deleted file mode 100644
index a4924ec7b..000000000
--- a/projectroot/etc/babeld.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-debug babel common
-!debug babel kernel
-!debug babel filter
-!debug babel timeout
-!debug babel interface
-!debug babel route
-!debug babel all
-
-router babel
-! network wlan0
-! network eth0
-! redistribute kernel
-! no redistribute static
-
-! The defaults are fine for a wireless interface
-
-!interface wlan0
-
-! A few optimisation tweaks are optional but recommended on a wired interface
-! Disable link quality estimation, enable split horizon processing, and
-! increase the hello and update intervals.
-
-!interface eth0
-! babel wired
-! babel split-horizon
-! babel hello-interval 12000
-! babel update-interval 36000
-
-! log file /var/log/quagga/babeld.log
-log stdout
diff --git a/projectroot/etc/bgpd.conf b/projectroot/etc/quagga/bgpd.conf
similarity index 100%
rename from projectroot/etc/bgpd.conf
rename to projectroot/etc/quagga/bgpd.conf
diff --git a/projectroot/etc/quagga/isisd.conf b/projectroot/etc/quagga/isisd.conf
new file mode 100644
index 000000000..47b15953f
--- /dev/null
+++ b/projectroot/etc/quagga/isisd.conf
@@ -0,0 +1,39 @@
+! -*- isis -*-
+!
+! ISISd sample configuration file
+!
+hostname isisd
+password foo
+enable password foo
+log stdout
+!log file /tmp/isisd.log
+!
+!
+router isis DEAD
+ net 47.0023.0000.0003.0300.0100.0102.0304.0506.00
+! is-type level-1
+
+! -- set the lifetime either for level-1, level-2 or both
+! lsp-lifetime level-1 65535
+! lsp-lifetime level-2 65535
+! lsp-lifetime 65535
+
+! hostname isisd-router
+! area-password foobar
+! domain-password foobar
+
+interface eth0
+ ip router isis DEAD
+! isis hello-interval 5
+! isis lsp-interval 1000
+
+! -- optional
+! isis circuit-type level-1
+! isis password lallaa level-1
+! isis metric 1 level-1
+! isis csnp-interval 5 level-1
+! isis retransmit-interval 10
+! isis retransmit-throttle-interval
+! isis hello-multiplier 2 level-1
+! isis priority 64
+!
diff --git a/projectroot/etc/quagga/nhrpd.conf b/projectroot/etc/quagga/nhrpd.conf
new file mode 100644
index 000000000..95ec5a515
--- /dev/null
+++ b/projectroot/etc/quagga/nhrpd.conf
@@ -0,0 +1 @@
+! sample configuration file
diff --git a/projectroot/etc/ospf6d.conf b/projectroot/etc/quagga/ospf6d.conf
similarity index 100%
rename from projectroot/etc/ospf6d.conf
rename to projectroot/etc/quagga/ospf6d.conf
diff --git a/projectroot/etc/ospfd.conf b/projectroot/etc/quagga/ospfd.conf
similarity index 100%
rename from projectroot/etc/ospfd.conf
rename to projectroot/etc/quagga/ospfd.conf
diff --git a/projectroot/etc/quagga/pimd.conf b/projectroot/etc/quagga/pimd.conf
new file mode 100644
index 000000000..67530856b
--- /dev/null
+++ b/projectroot/etc/quagga/pimd.conf
@@ -0,0 +1,41 @@
+!
+! pimd sample configuration file
+! $QuaggaId: $Format:%an, %ai, %h$ $
+!
+hostname quagga-pimd-router
+password zebra
+!enable password zebra
+!
+!log file pimd.log
+log stdout
+!
+line vty
+ exec-timeout 60
+!
+!debug igmp
+!debug pim
+!debug pim zebra
+!
+ip multicast-routing
+!
+! ! You may want to enable ssmpingd for troubleshooting
+! ! See http://www.venaas.no/multicast/ssmping/
+! !
+! ip ssmpingd 1.1.1.1
+! ip ssmpingd 2.2.2.2
+!
+! ! HINTS:
+! ! - Enable "ip pim ssm" on the interface directly attached to the
+! ! multicast source host (if this is the first-hop router)
+! ! - Enable "ip pim ssm" on pim-routers-facing interfaces
+! ! - Enable "ip igmp" on IGMPv3-hosts-facing interfaces
+! ! - In order to inject IGMPv3 local membership information in the
+! ! PIM protocol state, enable both "ip pim ssm" and "ip igmp" on
+! ! the same interface; otherwise PIM won't advertise
+! ! IGMPv3-learned membership to other PIM routers
+!
+interface eth0
+ ip pim ssm
+ ip igmp
+
+! -x-
diff --git a/projectroot/etc/ripd.conf b/projectroot/etc/quagga/ripd.conf
similarity index 100%
rename from projectroot/etc/ripd.conf
rename to projectroot/etc/quagga/ripd.conf
diff --git a/projectroot/etc/ripngd.conf b/projectroot/etc/quagga/ripngd.conf
similarity index 100%
rename from projectroot/etc/ripngd.conf
rename to projectroot/etc/quagga/ripngd.conf
diff --git a/projectroot/etc/vtysh.conf b/projectroot/etc/quagga/vtysh.conf
similarity index 100%
rename from projectroot/etc/vtysh.conf
rename to projectroot/etc/quagga/vtysh.conf
diff --git a/projectroot/etc/zebra.conf b/projectroot/etc/quagga/zebra.conf
similarity index 100%
rename from projectroot/etc/zebra.conf
rename to projectroot/etc/quagga/zebra.conf
diff --git a/rules/quagga.in b/rules/quagga.in
index 54e60bff9..9db68ec53 100644
--- a/rules/quagga.in
+++ b/rules/quagga.in
@@ -4,6 +4,7 @@ menuconfig QUAGGA
tristate
select NET_SNMP
select NET_SNMP_MIB_MODULES_AGENTX
+ select C_ARES if QUAGGA_NHRPD
select READLINE if QUAGGA_VTYSH
select TERMCAP if QUAGGA_VTYSH
prompt "quagga "
@@ -52,6 +53,13 @@ config QUAGGA_RIPNGD
help
Disable the ripngd component if you do not need it
+config QUAGGA_OSPF
+ bool
+ default y
+ prompt "Install ospfclient"
+ help
+ Disable the ospfclient component if you do not need it
+
config QUAGGA_OSPFD
bool
default y
@@ -66,12 +74,12 @@ config QUAGGA_OSPF6D
help
Disable the ospf6d component if you do not need it
-config QUAGGA_BABELD
+config QUAGGA_NHRPD
bool
default y
- prompt "Install babeld"
+ prompt "Install nhrpd"
help
- Disable the babeld component if you do not need it
+ Disable the nhrpd component if you do not need it
config QUAGGA_WATCHQUAGGA
bool
@@ -80,4 +88,18 @@ config QUAGGA_WATCHQUAGGA
help
Disable the watchquagga component if you do not need it
+config QUAGGA_ISISD
+ bool
+ default y
+ prompt "Install isisd"
+ help
+ Disable the isisd component if you do not need it
+
+config QUAGGA_PIMD
+ bool
+ default y
+ prompt "Install pimd"
+ help
+ Disable the pimd component if you do not need it
+
endif
diff --git a/rules/quagga.make b/rules/quagga.make
index a471ac521..5c17c38b4 100644
--- a/rules/quagga.make
+++ b/rules/quagga.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QUAGGA) += quagga
#
# Paths and names
#
-QUAGGA_VERSION := 0.99.23
-QUAGGA_MD5 := d17145e62b6ea14f0f13bb63f59e5166
+QUAGGA_VERSION := 1.2.4
+QUAGGA_MD5 := eced21b054d71c9e1b7c6ac43286a166
QUAGGA := quagga-$(QUAGGA_VERSION)
QUAGGA_SUFFIX := tar.gz
QUAGGA_URL := http://download.savannah.gnu.org/releases/quagga/$(QUAGGA).$(QUAGGA_SUFFIX)
@@ -36,7 +36,6 @@ QUAGGA_CONF_TOOL := autoconf
QUAGGA_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
- $(GLOBAL_IPV6_OPTION) \
--$(call ptx/endis, PTXCONF_QUAGGA_VTYSH)-vtysh \
--$(call ptx/endis, PTXCONF_QUAGGA_ZEBRA)-zebra \
--$(call ptx/endis, PTXCONF_QUAGGA_BGPD)-bgpd \
@@ -44,19 +43,16 @@ QUAGGA_CONF_OPT := \
--$(call ptx/endis, PTXCONF_QUAGGA_RIPNGD)-ripngd \
--$(call ptx/endis, PTXCONF_QUAGGA_OSPFD)-ospfd \
--$(call ptx/endis, PTXCONF_QUAGGA_OSPF6D)-ospf6d \
- --$(call ptx/endis, PTXCONF_QUAGGA_BABELD)-babeld \
+ --$(call ptx/endis, PTXCONF_QUAGGA_NHRPD)-nhrpd \
--$(call ptx/endis, PTXCONF_QUAGGA_WATCHQUAGGA)-watchquagga \
+ --$(call ptx/endis, PTXCONF_QUAGGA_ISISD)-isisd \
+ --$(call ptx/endis, PTXCONF_QUAGGA_PIMD)-pimd \
--disable-doc \
- --enable-isisd \
- --enable-solaris \
--disable-bgp-announce \
- --enable-netlink \
--enable-snmp=agentx \
--enable-tcp-zebra \
- --disable-opaque-lsa \
- --disable-ospfapi \
- --disable-ospfclient \
- --disable-ospf-te \
+ --$(call ptx/endis, PTXCONF_QUAGGA_OSPF)-ospfapi \
+ --$(call ptx/endis, PTXCONF_QUAGGA_OSPF)-ospfclient \
--enable-multipath=1 \
--enable-user=user \
--enable-group=group \
@@ -74,8 +70,7 @@ QUAGGA_CONF_OPT := \
--disable-backtrace \
--disable-time-check \
--enable-pcreposix \
- --enable-fpm \
- --disable-pie
+ --enable-fpm
# ----------------------------------------------------------------------------
# Target-Install
@@ -94,41 +89,52 @@ $(STATEDIR)/quagga.targetinstall:
ifdef PTXCONF_QUAGGA_RIPD
@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ripd)
- @$(call install_alternative, quagga, 0, 0, 0644, /etc/ripd.conf)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/ripd.conf)
endif
ifdef PTXCONF_QUAGGA_RIPNGD
@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ripngd)
- @$(call install_alternative, quagga, 0, 0, 0644, /etc/ripngd.conf)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/ripngd.conf)
endif
-ifdef PTXCONF_QUAGGA_BABELD
- @$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/babeld)
- @$(call install_alternative, quagga, 0, 0, 0644, /etc/babeld.conf)
+ifdef PTXCONF_QUAGGA_NHRPD
+ @$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/nhrpd)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/nhrpd.conf)
endif
ifdef PTXCONF_QUAGGA_BGPD
@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/bgpd)
- @$(call install_alternative, quagga, 0, 0, 0644, /etc/bgpd.conf)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/bgpd.conf)
endif
ifdef PTXCONF_QUAGGA_ZEBRA
@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/zebra)
- @$(call install_alternative, quagga, 0, 0, 0644, /etc/zebra.conf)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/zebra.conf)
endif
ifdef PTXCONF_QUAGGA_OSPFD
@$(call install_lib, quagga, 0, 0, 0644, libospf)
@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ospfd)
- @$(call install_alternative, quagga, 0, 0, 0644, /etc/ospfd.conf)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/ospfd.conf)
endif
ifdef PTXCONF_QUAGGA_OSPF6D
@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ospf6d)
- @$(call install_alternative, quagga, 0, 0, 0644, /etc/ospf6d.conf)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/ospf6d.conf)
endif
ifdef PTXCONF_QUAGGA_WATCHQUAGGA
@$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/watchquagga)
endif
ifdef PTXCONF_QUAGGA_VTYSH
@$(call install_copy, quagga, 0, 0, 0755, -, /usr/bin/vtysh)
- @$(call install_alternative, quagga, 0, 0, 0644, /etc/vtysh.conf)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/vtysh.conf)
+endif
+ifdef PTXCONF_QUAGGA_ISISD
+ @$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/isisd)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/isisd.conf)
+endif
+ifdef PTXCONF_QUAGGA_PIMD
+ @$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/pimd)
+ @$(call install_alternative, quagga, 0, 0, 0644, /etc/quagga/pimd.conf)
+endif
+ifdef PTXCONF_QUAGGA_OSPF
+ @$(call install_lib, quagga, 0, 0, 0644, libospfapiclient)
+ @$(call install_copy, quagga, 0, 0, 0755, -, /usr/sbin/ospfclient)
endif
-
@$(call install_finish, quagga)
--
2.17.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2018-05-07 16:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180507164637.GA29133@lenoch \
--to=ladis@linux-mips.org \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox