From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Subject: Re: [PATCH 14/26] tcp-wrappers: Use bitbake default FILES for packaging
Date: Tue, 12 Jul 2011 12:10:15 -0700 [thread overview]
Message-ID: <4E1C9C17.2050905@linux.intel.com> (raw)
In-Reply-To: <917F1944-E900-4DD8-8A44-FB1F3AB9F330@dominion.thruhere.net>
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
>
next prev parent reply other threads:[~2011-07-12 19:14 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-11 23:13 [PATCH 00/26] Staticdev re-packaging - split version Saul Wold
2011-07-11 23:13 ` [PATCH 01/26] bitbake.conf: Add *-config to default ${PN}-dev package Saul Wold
2011-07-12 9:05 ` Phil Blundell
2011-07-11 23:13 ` [PATCH 02/26] lib_package.bbclass: add *_nonshared.a to -dev package Saul Wold
2011-07-12 9:59 ` Phil Blundell
2011-07-11 23:13 ` [PATCH 03/26] shared_lib.bbclass: create common class Saul Wold
2011-07-12 6:57 ` Koen Kooi
2011-07-12 9:11 ` Phil Blundell
2011-07-12 9:13 ` Phil Blundell
2011-07-12 18:26 ` Saul Wold
2011-07-11 23:13 ` [PATCH 04/26] pciutils: repackage development files in pciutils instead of libpci Saul Wold
2011-07-11 23:13 ` [PATCH 05/26] wireless-tools: Updated for staticdev packaging Saul Wold
2011-07-12 7:02 ` Koen Kooi
2011-07-11 23:13 ` [PATCH 06/26] augeas: inherit shared_lib class Saul Wold
2011-07-11 23:13 ` [PATCH 07/26] gamin: " Saul Wold
2011-07-11 23:13 ` [PATCH 08/26] sqlite3: " Saul Wold
2011-07-12 7:00 ` Koen Kooi
2011-07-12 18:41 ` Saul Wold
2011-07-12 18:48 ` Phil Blundell
2011-07-12 19:24 ` Saul Wold
2011-07-11 23:13 ` [PATCH 09/26] curl: " Saul Wold
2011-07-11 23:13 ` [PATCH 10/26] attr: " Saul Wold
2011-07-11 23:13 ` [PATCH 11/26] rpm: Create ${PN}-staticdev package Saul Wold
2011-07-12 7:11 ` Koen Kooi
2011-07-11 23:13 ` [PATCH 12/26] libxft: use default bitbake.conf FILES Packaging to handle staticdev Saul Wold
2011-07-12 7:10 ` Koen Kooi
2011-07-11 23:13 ` [PATCH 13/26] js: Use bitbake default FILES for packaging Saul Wold
2011-07-12 7:13 ` Koen Kooi
2011-07-12 18:48 ` Saul Wold
2011-07-11 23:13 ` [PATCH 14/26] tcp-wrappers: " Saul Wold
2011-07-12 7:16 ` Koen Kooi
2011-07-12 19:10 ` Saul Wold [this message]
2011-07-11 23:13 ` [PATCH 15/26] udev: " Saul Wold
2011-07-11 23:13 ` [PATCH 16/26] liba52: " Saul Wold
2011-07-11 23:13 ` [PATCH 17/26] python: " Saul Wold
2011-07-12 7:08 ` Koen Kooi
2011-07-11 23:13 ` [PATCH 18/26] external-csl-toolchain: " Saul Wold
2011-07-11 23:13 ` [PATCH 19/26] opkg: " Saul Wold
2011-07-11 23:13 ` [PATCH 20/26] util-linux: " Saul Wold
2011-07-11 23:13 ` [PATCH 21/26] gettext: " Saul Wold
2011-07-12 7:17 ` Koen Kooi
2011-07-11 23:13 ` [PATCH 22/26] gcc: " Saul Wold
2011-07-11 23:13 ` [PATCH 23/26] glibc: " Saul Wold
2011-07-12 7:16 ` Koen Kooi
2011-07-11 23:13 ` [PATCH 24/26] eglibc: " Saul Wold
2011-07-11 23:13 ` [PATCH 25/26] uclibc: " Saul Wold
2011-07-11 23:13 ` [PATCH 26/26] binutils: " Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E1C9C17.2050905@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=koen@dominion.thruhere.net \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox