Skip to contentSkip to conversation

Phil Blundell : libcap: respect ${base_sbindir}

oe-commits Martin Jansa 2 participants 3 messages Sep 24, 2012 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20120924103553.BC0E91038B@opal

Martin Jansa

author
#1 lore raw
Quoted 27 lines · On Mon, Sep 24, 2012 at 10:35:53AM +0000, [email protected] 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 <[email protected]>
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 <[email protected]>
Signed-off-by Richard Purdie <[email protected]>

---

 meta/recipes-support/libcap/libcap.inc     |    2 +-
 meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/libcap/libcap.inc +0 -0
index 5d7291e..bfaeffd 100644

meta/recipes-support/libcap/libcap.inc do_compile() { · line 47

Quoted 6 lines
meta/recipes-support/libcap/libcap.inc +1 -1
@@ -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,

Quoted 19 lines
meta/recipes-support/libcap/libcap.inc +0 -0
 do_install_append() {
meta/recipes-support/libcap/libcap_2.22.bb +1 -1
index b631c51..d57c102 100644
@@ -1,6 +1,6 @@
 require libcap.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI[md5sum] = "b4896816b626bea445f0b3849bdd4077"
 SRC_URI[sha256sum] = "e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f"

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 10 lines · Martin Jansa

Review

Quoted 4 lines · On Mon, Sep 24, 2012 at 10:35:53AM +0000, [email protected] wrote:

do_install() {

(quoted diff) +1 -1
-	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

Ah, looks like that should have been ${sbindir} not ${base_sbindir}. Does it work for you if you make that change?

p.

author
#3 lore raw
Quoted 9 lines · Phil Blundell
Quoted 8 lines · Martin Jansa

Review

Quoted 4 lines · On Mon, Sep 24, 2012 at 10:35:53AM +0000, [email protected] wrote:

do_install() {

(quoted diff) +1 -1
-	oe_runmake install DESTDIR="${D}" prefix="${prefix}"
+	oe_runmake install DESTDIR="${D}" prefix="${prefix}" SBINDIR="${D}${base_sbindir}"
 }

This breaks packaging:

Quoted 5 lines
Quoted 2 lines

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

Ah, looks like that should have been ${sbindir} not ${base_sbindir}. Does it work for you if you make that change?

Yes, then it does work.

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]