Re: [meta-oe][PATCH] libsmi: add configure file

[Martin Jansa <martin.jansa@gmail.com>]

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

On Wed, Nov 04, 2015 at 05:46:36PM +0800, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
> 
> Add configure file duplicated from file smi.conf-example in source code
> and replace paths with mibs files directories.
> 
> Then set libsmi-mibs as runtime recommend package to provide mibs files.
> 
> Add homepage and update SRC_URI as well.
> 
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>  meta-oe/recipes-support/libsmi/libsmi/smi.conf | 48 ++++++++++++++++++++++++++
>  meta-oe/recipes-support/libsmi/libsmi_0.4.8.bb | 12 ++++++-
>  2 files changed, 59 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-support/libsmi/libsmi/smi.conf
> 
> diff --git a/meta-oe/recipes-support/libsmi/libsmi/smi.conf b/meta-oe/recipes-support/libsmi/libsmi/smi.conf
> new file mode 100644
> index 0000000..7e4da86
> --- /dev/null
> +++ b/meta-oe/recipes-support/libsmi/libsmi/smi.conf
> @@ -0,0 +1,48 @@
> +#
> +# smi.conf - Global/User SMI configuration file. (EXAMPLE)
> +#
> +# Copyright (c) 2000 Frank Strauss, Technical University of Braunschweig.
> +#
> +# See the file "COPYING" for information on usage and redistribution
> +# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
> +#
> +# @(#) $Id: smi.conf-example 1134 2001-06-11 09:59:13Z strauss $
> +#
> +#
> +# See smi_config(3) for detailed information on configuration files.
> +#
> +
> +# Extend (note the semicolon) the libsmi default module search path.
> +path :/usr/share/mibs/iana
> +path :/usr/share/mibs/ietf
> +path :/usr/share/mibs/irtf
> +path :/usr/share/mibs/tubs
> +
> +# EXPERIMENTAL: Add a caching method (works only on UNIX systems).
> +# NOTE: the cache directory must exist and permissions must be
> +# handled appropriately. A simple but insecure way is to apply
> +# a tmp flag to the directory (chmod 1777 /usr/local/share/mibs/cache).
> +#cache /usr/local/share/mibs/cache /usr/local/bin/smicache -d /usr/local/share/mibs/cache -p http://www.ibr.cs.tu-bs.de/projects/libsmi/smicache/
> +
> +# Don't show any errors by default.
> +level 0
> +
> +# Preload some basic SMIv2 modules.
> +load SNMPv2-SMI
> +load SNMPv2-TC
> +load SNMPv2-CONF
> +
> +# Make smilint shout loud to report all errors and warnings.
> +smilint: level 9
> +
> +# But please don't claim about any names longer than 32 chars.
> +# (note: this is the prefix of errors `namelength-32-module,
> +#  -type, -object, -enumeration, and -bit)
> +smilint: hide namelength-32
> +
> +# Preloading some more modules for special applications.
> +tcpdump: load DISMAN-SCRIPT-MIB
> +tcpdump: load IF-MIB
> +
> +smiquery: load IF-MIB
> +
> diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.4.8.bb b/meta-oe/recipes-support/libsmi/libsmi_0.4.8.bb
> index 2b036f9..e1af636 100644
> --- a/meta-oe/recipes-support/libsmi/libsmi_0.4.8.bb
> +++ b/meta-oe/recipes-support/libsmi/libsmi_0.4.8.bb
> @@ -1,16 +1,26 @@
>  SUMMARY = "A Library to Access SMI MIB Information"
> +HOMEPAGE = "https://www.ibr.cs.tu-bs.de/projects/libsmi"
>  
>  LICENSE = "BSD"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=3ad3076f9332343a21636cfd351f05b7"
>  
> -SRC_URI = "ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/${BP}.tar.gz"
> +SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \
> +           file://smi.conf \

4 spaces

> +          "

Closing quote should be first character.

>  
>  SRC_URI[md5sum] = "760b6b1070738158708649ed2c63425e"
>  SRC_URI[sha256sum] = "f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849"
>  
>  inherit autotools
>  
> +do_install_append () {
> +	install -d ${D}${sysconfdir}
> +	install -m 0644 ${WORKDIR}/smi.conf ${D}${sysconfdir}/smi.conf

Sane layers are using consistent indentation with 4 spaces.

I've fixed this when cherry-picking to master.

> +}
> +
>  PACKAGES += "${PN}-mibs ${PN}-pibs"
>  
>  FILES_${PN}-mibs += "${datadir}/mibs"
>  FILES_${PN}-pibs += "${datadir}/pibs"
> +
> +RRECOMMENDS_${PN} = "${BPN}-mibs"
> -- 
> 2.6.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

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