[OE-core] [oe-commits] Phil Blundell : libcap: respect ${base_sbindir}

[Martin Jansa]

On Mon, Sep 24, 2012 at 10:35:53AM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 3dffb9f577b794e8b78fb884adf9a15c45965bc4
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3dffb9f577b794e8b78fb884adf9a15c45965bc4
> 
> Author: Phil Blundell <philb at gnu.org>
> Date:   Sat Sep 22 14:25:19 2012 +0100
> 
> libcap: respect ${base_sbindir}
> 
> Need to pass the path explicitly to "make install" to ensure that the binaries end up
> in the right locations.
> 
> Signed-off-by: Phil Blundell <pb at pbcl.net>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> ---
> 
>  meta/recipes-support/libcap/libcap.inc     |    2 +-
>  meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
> index 5d7291e..bfaeffd 100644
> --- a/meta/recipes-support/libcap/libcap.inc
> +++ b/meta/recipes-support/libcap/libcap.inc
> @@ -43,7 +43,7 @@ do_compile() {
>  }
>  
>  do_install() {
> -	oe_runmake install DESTDIR="${D}" prefix="${prefix}"
> +	oe_runmake install DESTDIR="${D}" prefix="${prefix}" SBINDIR="${D}${base_sbindir}"
>  }

This breaks packaging:

/sbin/capsh /sbin/getcap /sbin/getpcaps /sbin/setcap
were moved from /usr/sbin/ and now are included in PN instead of PN-bin

As side-effect debian.bbclass does not provide libpcap2 anymore.

Here is relevant buildhistory commit:
https://github.com/shr-distribution/buildhistory/commit/5e8be2eb2984847e97e62bc0ca9292378fe72363

Cheers,

>  do_install_append() {
> diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
> index b631c51..d57c102 100644
> --- a/meta/recipes-support/libcap/libcap_2.22.bb
> +++ b/meta/recipes-support/libcap/libcap_2.22.bb
> @@ -1,6 +1,6 @@
>  require libcap.inc
>  
> -PR = "r3"
> +PR = "r4"
>  
>  SRC_URI[md5sum] = "b4896816b626bea445f0b3849bdd4077"
>  SRC_URI[sha256sum] = "e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f"
> 
> 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20120924/317a8abe/attachment-0002.sig>