[OE-core] [PATCH 14/26] tcp-wrappers: Use bitbake default FILES for packaging

[Koen Kooi]

Op 12 jul 2011, om 01:13 heeft Saul Wold het volgende geschreven:

> This will ensure correct -dev and -staticdev packging
> 
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> ---
> .../tcp-wrappers/tcp-wrappers_7.6.bb               |   17 ++++++++++-------
> 1 files changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
> index 1aeb9ff..1acb15a 100644
> --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
> +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
> @@ -5,13 +5,16 @@ SECTION = "console/network"
> 
> LICENSE = "tcp-wrappers"
> LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa"
> -PR ="r0"
> +PR ="r1"
> 
> 
> -PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev tcp-wrappers tcp-wrappers-doc"
> -FILES_libwrap = "${base_libdir}/lib*.so.*"

base_libdir

> +PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev \
> +            tcp-wrappers tcp-wrappers-doc"
> +FILES_libwrap = "${base_libdir}/lib*${SOLIBS}

base_libdir, so far, so good

> FILES_libwrap-doc = "${mandir}/man3 ${mandir}/man5"
> -FILES_libwrap-dev = "${libdir}/lib*.so ${libdir}/lib*.a ${includedir}"
> +FILES_libwrap-dev = "${libdir}/lib*${SOLIBSDEV} ${includedir}"

libdir

> +FILES_libwrap-staticdev = "${libdir}/lib*.a"

libdir

> +RDEPENDS_libwrap-staticdev = "libwrap-dev (= ${EXTENDPKGV})"
> FILES_tcp-wrappers = "${bindir}"
> FILES_tcp-wrappers-doc = "${mandir}/man8"
> 
> @@ -86,9 +89,9 @@ do_install () {
> 	oe_libinstall -C shared -so libwrap ${D}${base_libdir}
> 
> 	rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
> -	libname=`readlink ${D}${base_libdir}/libwrap.so | xargs basename`
> -	ln -s ${rel_lib_prefix}${base_libdir}/${libname} ${D}${libdir}/libwrap.so
> -	rm -f ${D}${base_libdir}/libwrap.so
> +	libname=`readlink ${D}${base_libdir}/libwrap${SOLIBSDEV} | xargs basename`
> +	ln -s ${rel_lib_prefix}${base_libdir}/${libname} ${D}${libdir}/libwrap${SOLIBSDEV}
> +	rm -f ${D}${base_libdir}/libwrap${SOLIBSDEV}

And here some bits get moved between base_libdir and libdir, what is it trying to do?