diff mbox

[14/28] attr: Change split and fix DEPENDS/RDEPENDS

Message ID 5208d4e25679e44f79a8e1a1915e9989a6f72336.1397117164.git.christian.braunersorensen@prevas.dk
State Changes Requested
Delegated to: Esben Haabendal
Headers show

Commit Message

christian.braunersorensen@prevas.dk April 10, 2014, 8:09 a.m. UTC
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

Previously, the library was split out using AUTO_PACKAGE_LIBS. This is
not necessary since its only a single library. Use library class instead.

Additionally split utilities out

Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk>
---
 recipes/attr/attr.inc | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Comments

Esben Haabendal April 14, 2014, 9:41 a.m. UTC | #1
Hi Christian

The "and" in the commit log message is a hint about something that would
have made sense to split into two commits ;)  At least in this case.

<christian.braunersorensen@prevas.dk> writes:

> From: Christian Sørensen <christian.braunersorensen@prevas.dk>
>
> Previously, the library was split out using AUTO_PACKAGE_LIBS. This is
> not necessary since its only a single library. Use library class instead.

Well, while you are right that it is not (anymore, with your added usage
of auto-package-utils) not necessary to use auto-package-libs, it does
seem to provide a more elegant packaging, and does not break backwards
compatibility.

With this change, any recipes (fx. rootfs recipes) that had "attr" in
RDEPENDS, will now just get libattr and not the recipe.  Adding in the
proper RDEPENDS_${PN} to fix this, would make it impossible to build a
rootfs with only libattr.  So for OE-lite/base, I cannot see how we can
do this change.

Also, with your new split approach, you get both the util and library
.debug folders in the attr-dbg package, whereas the auto-package-libs
approach put the library .debug file in attr-libattr-dbg package.
Of-course, if the auto-package-utils were a bit smarter, there would be
attr-attr-dbg, attr-getattr-dbg and so on.  But for now, it is not that
smart.

So please, could you resend without the switch from auto-package-libs to
library?

> Additionally split utilities out

This is fine.

/Esben

>
> Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk>
> ---
>  recipes/attr/attr.inc | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/recipes/attr/attr.inc b/recipes/attr/attr.inc
> index 2e5373a..ec040b5 100644
> --- a/recipes/attr/attr.inc
> +++ b/recipes/attr/attr.inc
> @@ -37,10 +37,16 @@ do_install() {
>  	rm -rf ${D}${libexecdir}
>  }
>  
> -inherit auto-package-libs
> -AUTO_PACKAGE_LIBS = "attr"
> -AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}"
> +inherit auto-package-utils
> +AUTO_PACKAGE_UTILS = "attr getfattr setfattr"
> +AUTO_PACKAGE_UTILS_RDEPENDS = "libattr"
>  
> -RDEPENDS_${PN} += "${PN}-libattr"
> +DEPENDS_${PN}-attr += "libattr"
> +DEPENDS_${PN}-getfattr += "libattr"
> +DEPENDS_${PN}-setfattr += "libattr"
>  
> -FILES_${PN}-dev += "${libexecdir}"
> +AUTO_PACKAGE_LIBS_RDEPENDS = "libc libattr"
> +
> +inherit library
> +
> +DEPENDS_${PN} += "libc"
diff mbox

Patch

diff --git a/recipes/attr/attr.inc b/recipes/attr/attr.inc
index 2e5373a..ec040b5 100644
--- a/recipes/attr/attr.inc
+++ b/recipes/attr/attr.inc
@@ -37,10 +37,16 @@  do_install() {
 	rm -rf ${D}${libexecdir}
 }
 
-inherit auto-package-libs
-AUTO_PACKAGE_LIBS = "attr"
-AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}"
+inherit auto-package-utils
+AUTO_PACKAGE_UTILS = "attr getfattr setfattr"
+AUTO_PACKAGE_UTILS_RDEPENDS = "libattr"
 
-RDEPENDS_${PN} += "${PN}-libattr"
+DEPENDS_${PN}-attr += "libattr"
+DEPENDS_${PN}-getfattr += "libattr"
+DEPENDS_${PN}-setfattr += "libattr"
 
-FILES_${PN}-dev += "${libexecdir}"
+AUTO_PACKAGE_LIBS_RDEPENDS = "libc libattr"
+
+inherit library
+
+DEPENDS_${PN} += "libc"