Patchwork [1/2] libcroco: dont package /usr/bin/croco-0.6-config

login
register
mail settings
Submitter Ming Liu
Date July 4, 2014, 10:54 a.m.
Message ID <1404471270-1536-1-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/75015/
State New
Headers show

Comments

Ming Liu - July 4, 2014, 10:54 a.m.
It's build time specific and should not be packaged, otherwise, it will
introduce conflicts among multilib build.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
---
 meta/recipes-support/libcroco/libcroco_0.6.8.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
Ross Burton - July 4, 2014, 11:03 a.m.
On 4 July 2014 11:54, Ming Liu <ming.liu@windriver.com> wrote:
> +PACKAGE_PREPROCESS_FUNCS += "croco_package_preprocess"
> +croco_package_preprocess () {
> +       if [ -f ${PKGD}/${bindir}/croco-0.6-config ]; then
> +               rm -f ${PKGD}/${bindir}/croco-0.6-config
> +       fi
> +}

Erm, this is wrong.

So croco-config is broken because the recipe doesn't inherit
binconfig, to fix the paths and install the binary into libcroco-dev,
where it belongs.  By not installing it into the package, you've
broken anything that wants to build using croco-config inside a
Yocto-generated image, such as the Build Appliance.

Considering that the only recipe to depend on libcroco is librsvg, and
that uses pkg-config instead of croco-config, then this recipe should
also inherit binconfig-disabled to turn the config script into a "exit
1" no-op.

Ross
Ming Liu - July 4, 2014, 11:08 a.m.
On 07/04/2014 07:03 PM, Burton, Ross wrote:
> On 4 July 2014 11:54, Ming Liu <ming.liu@windriver.com> wrote:
>> +PACKAGE_PREPROCESS_FUNCS += "croco_package_preprocess"
>> +croco_package_preprocess () {
>> +       if [ -f ${PKGD}/${bindir}/croco-0.6-config ]; then
>> +               rm -f ${PKGD}/${bindir}/croco-0.6-config
>> +       fi
>> +}
> Erm, this is wrong.
>
> So croco-config is broken because the recipe doesn't inherit
> binconfig, to fix the paths and install the binary into libcroco-dev,
> where it belongs.  By not installing it into the package, you've
> broken anything that wants to build using croco-config inside a
> Yocto-generated image, such as the Build Appliance.
>
> Considering that the only recipe to depend on libcroco is librsvg, and
> that uses pkg-config instead of croco-config, then this recipe should
> also inherit binconfig-disabled to turn the config script into a "exit
> 1" no-op.
Yes, you are right! Thanks to correct me, I will send a V2 soon.

the best,
thank you
>
> Ross
>
>

Patch

diff --git a/meta/recipes-support/libcroco/libcroco_0.6.8.bb b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
index 7d04265..a926a1c 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.8.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
@@ -19,3 +19,14 @@  GNOME_COMPRESS_TYPE = "xz"
 
 SRC_URI[archive.md5sum] = "767e73c4174f75b99695d4530fd9bb80"
 SRC_URI[archive.sha256sum] = "ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570"
+
+#
+# Don't package croco-0.6-config, it's build time specific.
+# Otherwise, it would cause conflicts among multilib install. 
+#
+PACKAGE_PREPROCESS_FUNCS += "croco_package_preprocess"
+croco_package_preprocess () {
+	if [ -f ${PKGD}/${bindir}/croco-0.6-config ]; then
+		rm -f ${PKGD}/${bindir}/croco-0.6-config
+	fi
+}