Patchwork [14/26] tcp-wrappers: Use bitbake default FILES for packaging

login
register
mail settings
Submitter Saul Wold
Date July 11, 2011, 11:13 p.m.
Message ID <f5be3f07f8372f657d248c739a666cf25fff06a4.1310425837.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/7381/
State New, archived
Headers show

Comments

Saul Wold - July 11, 2011, 11:13 p.m.
This will ensure correct -dev and -staticdev packging

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../tcp-wrappers/tcp-wrappers_7.6.bb               |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
Koen Kooi - July 12, 2011, 7:16 a.m.
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@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?
Saul Wold - July 12, 2011, 7:10 p.m.
On 07/12/2011 12:16 AM, Koen Kooi wrote:
>
> 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@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
>
Correct they are needed in base_libdir since they are used by cmds 
located in base_bindir.

>> 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
>
This also seems OK to me (not my doing originally) as it matches how 
other libraries are delivered.

>> +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?

Based on the make file the .so is delivered into base_libdir and needs 
to be moved to libdir, thus this code.

Sau!

> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

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.*"
+PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev \
+            tcp-wrappers tcp-wrappers-doc"
+FILES_libwrap = "${base_libdir}/lib*${SOLIBS}
 FILES_libwrap-doc = "${mandir}/man3 ${mandir}/man5"
-FILES_libwrap-dev = "${libdir}/lib*.so ${libdir}/lib*.a ${includedir}"
+FILES_libwrap-dev = "${libdir}/lib*${SOLIBSDEV} ${includedir}"
+FILES_libwrap-staticdev = "${libdir}/lib*.a"
+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}
 
 	install -d ${D}${sbindir}
 	for b in ${BINS}; do