From: Kai Kang <[email protected]>

There are comments which contains path of ${libdir} in configure files.
It causes install file conflicts when intall cups and lib32-cups at same
time.

Replace ${libdir} with {nonarch_libdir} of the comment lines in config
files to fix the issue.

Signed-off-by: Kai Kang <[email protected]>
---
 meta/recipes-extended/cups/cups.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-extended/cups/cups.inc 
b/meta/recipes-extended/cups/cups.inc
index 717eef03a7..b8ad1e09e5 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -78,6 +78,9 @@ do_install () {
            rm -rf ${D}${sysconfdir}/init.d/
            rm -rf ${D}${sysconfdir}/rc*
        fi
+
+       # workaround for multilib install file conflicts
+       sed -i "s:\(^#.*\)${libdir}:\1${nonarch_libdir}:" 
${D}${sysconfdir}/cups/cups-files.conf*
 }
 
 PACKAGES =+ "${PN}-lib ${PN}-libimage"
-- 
2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to