David -
You mention 'buildtest.sh' in your email. I haven't been using it because
I was unaware of it. Perhaps it should be mentioned in the HACKING.tex?
Something as simple as:
diff --git a/HACKING.tex b/HACKING.tex
index be86ae1..900289c 100644
--- a/HACKING.tex
+++ b/HACKING.tex
@@ -277,6 +277,7 @@ etc.), try to check that the following things still
work:
\item make dist
\item resulting dist tarball builds
\item out-of-tree builds
+\item buildtest.sh
\end{itemize}
The quagga.net site relies on make dist to work to generate snapshots. It
I didn't make this an official patch because I thought you might have some
informal feedback on what you would like different, plus you are much
closer to the code there.
donald
On Mon, May 18, 2015 at 4:03 PM, David Lamparter <
[email protected]> wrote:
> This removes some more bits of babeld, particularly from:
> - buildtest.sh
> - redhat/ build files
> - vtysh integration (which actively broke the build)
>
> The memtype and zclient/route type are kept in place since these don't
> break anything and -theoretically- make it possible to build babeld
> with some Quagga integration externally.
> (Keeping vtysh integration is unfortunately not as easy.)
>
> Reported-by: Donald Sharp <[email protected]>
> Fixes: 336724d ("babeld: Remove babeld from Quagga")
> Cc: Paul Jakma <[email protected]>
> Signed-off-by: David Lamparter <[email protected]>
> ---
>
> Let me take this as an opportunity to once again point out the
> "buildtest.sh" script. It may not show all build issues, but it
> shows many, including this one.
>
> (There was another issue further down in vtysh, with
> BABEL_VTYSH_PATH being undefined.)
>
> NB: redhat/ scripts untested.
>
> ---
> buildtest.sh | 2 +-
> pimd/quagga-configure-no-vtysh.sh | 2 +-
> redhat/Makefile.am | 2 +-
> redhat/babeld.init | 72
> ---------------------------------------
> redhat/babeld.service | 14 --------
> redhat/quagga.logrotate | 8 -----
> redhat/quagga.spec.in | 3 +-
> vtysh/Makefile.am | 1 -
> vtysh/extract.pl.in | 1 -
> vtysh/vtysh.c | 20 -----------
> vtysh/vtysh_config.c | 2 --
> 11 files changed, 4 insertions(+), 123 deletions(-)
> delete mode 100644 redhat/babeld.init
> delete mode 100644 redhat/babeld.service
>
> diff --git a/buildtest.sh b/buildtest.sh
> index 3dd8ed8..ca0c036 100755
> --- a/buildtest.sh
> +++ b/buildtest.sh
> @@ -4,7 +4,7 @@
> # builds some git commit of Quagga in some different configurations
> # usage: buildtest.sh [commit [configurations...]]
>
> -basecfg="--prefix=/usr --enable-user=quagga --enable-group=quagga
> --enable-vty-group=quagga --enable-configfile-mask=0660
> --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/quagga
> --enable-exampledir=/etc/quagga/samples --localstatedir=/var/run/quagga
> --libdir=/usr/lib64/quagga --enable-rtadv --disable-static --enable-isisd
> --enable-multipath=0 --enable-babeld --enable-pimd --enable-werror"
> +basecfg="--prefix=/usr --enable-user=quagga --enable-group=quagga
> --enable-vty-group=quagga --enable-configfile-mask=0660
> --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/quagga
> --enable-exampledir=/etc/quagga/samples --localstatedir=/var/run/quagga
> --libdir=/usr/lib64/quagga --enable-rtadv --disable-static --enable-isisd
> --enable-multipath=0 --enable-pimd --enable-werror"
>
> configs_base="gcc|$basecfg"
>
> diff --git a/pimd/quagga-configure-no-vtysh.sh
> b/pimd/quagga-configure-no-vtysh.sh
> index b3052dc..672007b 100755
> --- a/pimd/quagga-configure-no-vtysh.sh
> +++ b/pimd/quagga-configure-no-vtysh.sh
> @@ -7,4 +7,4 @@
> #
> # $QuaggaId: $Format:%an, %ai, %h$ $
>
> -./configure --disable-babeld --disable-bgpd --disable-ripd
> --disable-ripngd --disable-ospfd --disable-ospf6d --disable-watchquagga
> --disable-bgp-announce --disable-ospfapi --disable-ospfclient
> --disable-rtadv --disable-irdp --enable-pimd --enable-tcp-zebra
> --enable-ipv6
> +./configure --disable-bgpd --disable-ripd --disable-ripngd
> --disable-ospfd --disable-ospf6d --disable-watchquagga
> --disable-bgp-announce --disable-ospfapi --disable-ospfclient
> --disable-rtadv --disable-irdp --enable-pimd --enable-tcp-zebra
> --enable-ipv6
> diff --git a/redhat/Makefile.am b/redhat/Makefile.am
> index c83e959..9612e91 100644
> --- a/redhat/Makefile.am
> +++ b/redhat/Makefile.am
> @@ -1,5 +1,5 @@
>
> -EXTRA_DIST = babeld.init babeld.service bgpd.init bgpd.service isisd.init
> \
> +EXTRA_DIST = bgpd.init bgpd.service isisd.init \
> isisd.service ospf6d.init ospf6d.service ospfd.init ospfd.service \
> quagga.logrotate quagga.pam quagga.pam.stack quagga.spec \
> quagga.sysconfig ripd.init ripd.service ripngd.init ripngd.service
> \
> diff --git a/redhat/babeld.init b/redhat/babeld.init
> deleted file mode 100644
> index 76e8e5e..0000000
> --- a/redhat/babeld.init
> +++ /dev/null
> @@ -1,72 +0,0 @@
> -#!/bin/bash
> -# chkconfig: - 16 84
> -# config: /etc/quagga/babeld.conf
> -
> -### BEGIN INIT INFO
> -# Provides: babeld
> -# Short-Description: Babel routing engine
> -# Description: Babel routing engine for use with Zebra
> -### END INIT INFO
> -
> -# source function library
> -. /etc/rc.d/init.d/functions
> -
> -# Get network config
> -. /etc/sysconfig/network
> -
> -# quagga command line options
> -. /etc/sysconfig/quagga
> -
> -RETVAL=0
> -PROG="babeld"
> -cmd=babeld
> -LOCK_FILE=/var/lock/subsys/babeld
> -CONF_FILE=/etc/quagga/babeld.conf
> -
> -case "$1" in
> - start)
> - # Check that networking is up.
> - [ "${NETWORKING}" = "no" ] && exit 1
> -
> - # The process must be configured first.
> - [ -f $CONF_FILE ] || exit 6
> - if [ `id -u` -ne 0 ]; then
> - echo $"Insufficient privilege" 1>&2
> - exit 4
> - fi
> -
> - echo -n $"Starting $PROG: "
> - daemon $cmd -d $BABELD_OPTS -f $CONF_FILE
> - RETVAL=$?
> - [ $RETVAL -eq 0 ] && touch $LOCK_FILE
> - echo
> - ;;
> - stop)
> - echo -n $"Shutting down $PROG: "
> - killproc $cmd
> - RETVAL=$?
> - [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
> - echo
> - ;;
> - restart|reload|force-reload)
> - $0 stop
> - $0 start
> - RETVAL=$?
> - ;;
> - condrestart|try-restart)
> - if [ -f $LOCK_FILE ]; then
> - $0 stop
> - $0 start
> - fi
> - RETVAL=$?
> - ;;
> - status)
> - status $cmd
> - RETVAL=$?
> - ;;
> - *)
> - echo $"Usage: $0
> {start|stop|restart|reload|force-reload|condrestart|try-restart|status}"
> - exit 2
> -esac
> -
> -exit $RETVAL
> diff --git a/redhat/babeld.service b/redhat/babeld.service
> deleted file mode 100644
> index b1ea943..0000000
> --- a/redhat/babeld.service
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -[Unit]
> -Description=Babel routing daemon
> -BindTo=zebra.service
> -After=syslog.target network.target zebra.service
> -ConditionPathExists=/etc/quagga/babeld.conf
> -
> -[Service]
> -Type=forking
> -EnvironmentFile=/etc/sysconfig/quagga
> -ExecStart=/usr/sbin/babeld -d $BABELD_OPTS -f /etc/quagga/babeld.conf
> -Restart=on-abort
> -
> -[Install]
> -WantedBy=network.target
> diff --git a/redhat/quagga.logrotate b/redhat/quagga.logrotate
> index 9756a78..afbd40c 100644
> --- a/redhat/quagga.logrotate
> +++ b/redhat/quagga.logrotate
> @@ -6,14 +6,6 @@
> endscript
> }
>
> -/var/log/quagga/babeld.log {
> - notifempty
> - missingok
> - postrotate
> - /bin/kill -USR1 `cat /var/run/quagga/babeld.pid 2> /dev/null` 2>
> /dev/null || true
> - endscript
> -}
> -
> /var/log/quagga/bgpd.log {
> notifempty
> missingok
> diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
> index 75835bb..43feea4 100644
> --- a/redhat/quagga.spec.in
> +++ b/redhat/quagga.spec.in
> @@ -68,7 +68,7 @@
> %define daemon_list zebra ripd ospfd bgpd
>
> %if %{with_ipv6}
> -%define daemonv6_list ripngd babeld ospf6d
> +%define daemonv6_list ripngd ospf6d
> %else
> %define daemonv6_list ""
> %endif
> @@ -409,7 +409,6 @@ rm -rf $RPM_BUILD_ROOT
> %if %{with_ipv6}
> %{_sbindir}/ripngd
> %{_sbindir}/ospf6d
> -%{_sbindir}/babeld
> %endif
> %if %{with_isisd}
> %{_sbindir}/isisd
> diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
> index 0cc6d5b..d1ff69b 100644
> --- a/vtysh/Makefile.am
> +++ b/vtysh/Makefile.am
> @@ -24,7 +24,6 @@ EXTRA_DIST = extract.pl
> vtysh_cmd_FILES = $(top_srcdir)/bgpd/*.c $(top_srcdir)/isisd/*.c \
> $(top_srcdir)/ospfd/*.c $(top_srcdir)/ospf6d/*.c \
> $(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.c \
> - $(top_srcdir)/babeld/*.c \
> $(top_srcdir)/pimd/pim_cmd.c \
> $(top_srcdir)/lib/keychain.c
> $(top_srcdir)/lib/routemap.c \
> $(top_srcdir)/lib/filter.c $(top_srcdir)/lib/plist.c \
> diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
> index d323cdb..99d80ed 100755
> --- a/vtysh/extract.pl.in
> +++ b/vtysh/extract.pl.in
> @@ -37,7 +37,6 @@ $ignore{'"router ripng"'} = "ignore";
> $ignore{'"router ospf"'} = "ignore";
> $ignore{'"router ospf <0-65535>"'} = "ignore";
> $ignore{'"router ospf6"'} = "ignore";
> -$ignore{'"router babel"'} = "ignore";
> $ignore{'"router bgp " "<1-4294967295>"'} = "ignore";
> $ignore{'"router bgp " "<1-4294967295>" " view WORD"'} = "ignore";
> $ignore{'"router isis WORD"'} = "ignore";
> diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
> index fbbc88d..e2d63f9 100644
> --- a/vtysh/vtysh.c
> +++ b/vtysh/vtysh.c
> @@ -58,7 +58,6 @@ struct vtysh_client
> { .fd = -1, .name = "ospf6d", .flag = VTYSH_OSPF6D, .path =
> OSPF6_VTYSH_PATH},
> { .fd = -1, .name = "bgpd", .flag = VTYSH_BGPD, .path = BGP_VTYSH_PATH},
> { .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path =
> ISIS_VTYSH_PATH},
> - { .fd = -1, .name = "babeld", .flag = VTYSH_BABELD, .path =
> BABEL_VTYSH_PATH},
> { .fd = -1, .name = "pimd", .flag = VTYSH_PIMD, .path = PIM_VTYSH_PATH},
> };
>
> @@ -799,12 +798,6 @@ static struct cmd_node ospf6_node =
> "%s(config-ospf6)# "
> };
>
> -static struct cmd_node babel_node =
> -{
> - BABEL_NODE,
> - "%s(config-babel)# "
> -};
> -
> static struct cmd_node keychain_node =
> {
> KEYCHAIN_NODE,
> @@ -1017,17 +1010,6 @@ DEFUNSH (VTYSH_OSPF6D,
> return CMD_SUCCESS;
> }
>
> -DEFUNSH (VTYSH_BABELD,
> - router_babel,
> - router_babel_cmd,
> - "router babel",
> - ROUTER_STR
> - "Babel")
> -{
> - vty->node = BABEL_NODE;
> - return CMD_SUCCESS;
> -}
> -
> DEFUNSH (VTYSH_ISISD,
> router_isis,
> router_isis_cmd,
> @@ -2266,7 +2248,6 @@ vtysh_init_vty (void)
> install_node (&ripng_node, NULL);
> install_node (&ospf6_node, NULL);
> /* #endif */
> - install_node (&babel_node, NULL);
> install_node (&keychain_node, NULL);
> install_node (&keychain_key_node, NULL);
> install_node (&isis_node, NULL);
> @@ -2369,7 +2350,6 @@ vtysh_init_vty (void)
> #ifdef HAVE_IPV6
> install_element (CONFIG_NODE, &router_ospf6_cmd);
> #endif
> - install_element (CONFIG_NODE, &router_babel_cmd);
> install_element (CONFIG_NODE, &router_isis_cmd);
> install_element (CONFIG_NODE, &router_bgp_cmd);
> install_element (CONFIG_NODE, &router_bgp_view_cmd);
> diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c
> index 1ddaac0..94dc995 100644
> --- a/vtysh/vtysh_config.c
> +++ b/vtysh/vtysh_config.c
> @@ -198,8 +198,6 @@ vtysh_config_parse_line (const char *line)
> config = config_get (OSPF_NODE, line);
> else if (strncmp (line, "router ospf6", strlen ("router ospf6")) ==
> 0)
> config = config_get (OSPF6_NODE, line);
> - else if (strncmp (line, "router babel", strlen ("router babel")) ==
> 0)
> - config = config_get (BABEL_NODE, line);
> else if (strncmp (line, "router bgp", strlen ("router bgp")) == 0)
> config = config_get (BGP_NODE, line);
> else if (strncmp (line, "router isis", strlen ("router isis")) == 0)
> --
> 2.3.6
>
>
> _______________________________________________
> Quagga-dev mailing list
> [email protected]
> https://lists.quagga.net/mailman/listinfo/quagga-dev
>
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
