Patchwork libcap: Fix erroneous path in last commit

login
register
mail settings
Submitter Phil Blundell
Date Sept. 24, 2012, 9:43 p.m.
Message ID <1348522985.1335.1.camel@x121e.pbcl.net>
Download mbox | patch
Permalink /patch/37147/
State Accepted
Commit 2c6725c1f8427a0920c2810d649010f98b7869eb
Headers show

Comments

Phil Blundell - Sept. 24, 2012, 9:43 p.m.
The directory used as SBINDIR should be ${sbindir} not ${base_sbindir}.
Reported by Martin Jansa <martin.jansa@gmail.com>

Signed-off-by: Phil Blundell <pb@pbcl.net>
---
 meta/recipes-support/libcap/libcap.inc     |    2 +-
 meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - Sept. 25, 2012, 9:41 a.m.
On Mon, 2012-09-24 at 22:43 +0100, Phil Blundell wrote:
> The directory used as SBINDIR should be ${sbindir} not ${base_sbindir}.
> Reported by Martin Jansa <martin.jansa@gmail.com>
> 
> Signed-off-by: Phil Blundell <pb@pbcl.net>
> ---
>  meta/recipes-support/libcap/libcap.inc     |    2 +-
>  meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index bfaeffd..27552ad 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}" SBINDIR="${D}${base_sbindir}"
+	oe_runmake install DESTDIR="${D}" prefix="${prefix}" SBINDIR="${D}${sbindir}"
 }
 
 do_install_append() {
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index d57c102..560bd69 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 = "r4"
+PR = "r5"
 
 SRC_URI[md5sum] = "b4896816b626bea445f0b3849bdd4077"
 SRC_URI[sha256sum] = "e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f"