Re: [PATCH meta-networking] quagga: two fixes

[Joe MacDonald <Joe.MacDonald@windriver.com>]

[-- Attachment #1: Type: text/plain, Size: 2413 bytes --]

Merged, thanks.
-J.

[[PATCH meta-networking] quagga: two fixes] On 13.08.16 (Fri 10:23) rongqing.li@windriver.com wrote:

> From: "Roy.Li" <rongqing.li@windriver.com>
> 
> 1. quagga should depend on iproute2, since ip from busybox is not sufficient
> 2. fix a typOS(should chmod, not chown)
> 
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>  meta-networking/recipes-protocols/quagga/quagga.inc |    9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
> index f5489c6..89b9f7a 100644
> --- a/meta-networking/recipes-protocols/quagga/quagga.inc
> +++ b/meta-networking/recipes-protocols/quagga/quagga.inc
> @@ -5,7 +5,7 @@ Unix platforms, particularly FreeBSD, Linux, Solaris and NetBSD. \
>  Quagga is a fork of GNU Zebra which was developed by Kunihiro \
>  Ishiguro. The Quagga tree aims to build a more involved community \
>  around Quagga than the current centralised model of GNU Zebra."
> -HOMEPAGE = "http://www.quagga.net/"
> +HOMEPAGE = "http://www.nongnu.org/quagga/"
>  SECTION = "network"
>  LICENSE = "GPL-2.0 & LGPL-2.0"
>  DEPENDS = "readline ncurses perl-native"
> @@ -17,6 +17,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
>  
>  INC_PR = "r2"
>  
> +# the "ip" command from busybox is not sufficient (flush by protocol flushes all routes)
> +RDEPENDS_${PN} += "iproute2"
> +
>  QUAGGASUBDIR = ""
>  # ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old
>  # versions and leave it empty for recent versions.
> @@ -128,11 +131,11 @@ pkg_postinst_${PN} () {
>      if [ "x$D" != "x" ] ; then
>          exit 1
>      fi
> -    for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done
> +    for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done
>      chown quagga:quaggavty ${sysconfdir}/quagga
>      chown quagga:quagga ${sysconfdir}/quagga/*.conf
>      chmod 750 ${sysconfdir}/quagga
> -    chown 640 ${sysconfdir}/quagga/*.conf
> +    chmod 640 ${sysconfdir}/quagga/*.conf
>      if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
>          ${sysconfdir}/init.d/populate-volatile.sh update
>      fi
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]