Patchwork [CONSOLIDATED,PULL,05/28] libcap: move library to base_libdir

login
register
mail settings
Submitter Saul Wold
Date Jan. 5, 2012, 6:30 a.m.
Message ID <e9a450bd3b519373e02ba235ebf5ce7750dc9767.1325744640.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/18377/
State New
Headers show

Comments

Saul Wold - Jan. 5, 2012, 6:30 a.m.
From: Scott Garman <scott.a.garman@intel.com>

ls from coreutils links to libcap, so move the libcap library
from libdir (/usr/lib) to base_libdir (/lib).

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-support/libcap/libcap.inc     |   15 +++++++++++++--
 meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)
Khem Raj - Jan. 21, 2012, 11:41 p.m.
On (04/01/12 22:30), Saul Wold wrote:
> From: Scott Garman <scott.a.garman@intel.com>
> 
> ls from coreutils links to libcap, so move the libcap library
> from libdir (/usr/lib) to base_libdir (/lib).
> 


what is motivation behind this ? needless we are tweaking the default
install mechanism that original package maintainer intended. This can
be a maintenace hassle. Is there a very strong reason to make these kind
of changes ?


> Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> ---
>  meta/recipes-support/libcap/libcap.inc     |   15 +++++++++++++--
>  meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
>  2 files changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
> index 184b58a..9418abf 100644
> --- a/meta/recipes-support/libcap/libcap.inc
> +++ b/meta/recipes-support/libcap/libcap.inc
> @@ -21,6 +21,8 @@ do_configure() {
>  	sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
>  }
>  
> +BUILD_LDFLAGS_virtclass_native += "-Wl,rpath=${base_libdir}"
> +
>  EXTRA_OEMAKE = " \
>    LIBATTR=yes \
>    PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
> @@ -42,8 +44,17 @@ do_install() {
>  	oe_runmake install DESTDIR="${D}" prefix="${prefix}"
>  }
>  
> +do_install_append() {
> +	# Move the library to base_libdir
> +	install -d ${D}${base_libdir}
> +	mv ${D}${libdir}/* ${D}${base_libdir}
> +	rmdir ${D}${libdir}
> +}
> +
> +FILES_${PN}-dev += "${base_libdir}/*.so"
> +
>  # pam files
> -FILES_${PN} += "${libdir}/security/*.so"
> -FILES_${PN}-dbg += "${libdir}/security/.debug/*.so"
> +FILES_${PN} += "${base_libdir}/security/*.so"
> +FILES_${PN}-dbg += "${base_libdir}/security/.debug/*.so"
>  
>  BBCLASSEXTEND = "native"
> diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
> index dd63d9e..be1df54 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 = "r2"
> +PR = "r3"
>  
>  SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
>  SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"
> -- 
> 1.7.6.4
> 
> 
> _______________________________________________
> 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-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 184b58a..9418abf 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -21,6 +21,8 @@  do_configure() {
 	sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
 }
 
+BUILD_LDFLAGS_virtclass_native += "-Wl,rpath=${base_libdir}"
+
 EXTRA_OEMAKE = " \
   LIBATTR=yes \
   PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
@@ -42,8 +44,17 @@  do_install() {
 	oe_runmake install DESTDIR="${D}" prefix="${prefix}"
 }
 
+do_install_append() {
+	# Move the library to base_libdir
+	install -d ${D}${base_libdir}
+	mv ${D}${libdir}/* ${D}${base_libdir}
+	rmdir ${D}${libdir}
+}
+
+FILES_${PN}-dev += "${base_libdir}/*.so"
+
 # pam files
-FILES_${PN} += "${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/security/.debug/*.so"
+FILES_${PN} += "${base_libdir}/security/*.so"
+FILES_${PN}-dbg += "${base_libdir}/security/.debug/*.so"
 
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index dd63d9e..be1df54 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 = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
 SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"