[oe-commits] [openembedded-core] 05/13: cups: redefine CUPS_SERVERBIN
git at git.openembedded.org
git at git.openembedded.org
Sat Sep 7 06:47:58 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit 274bed042b9c2b50a8bdd11b42f1a62405fb5b11
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed Sep 4 05:35:53 2019 -0400
cups: redefine CUPS_SERVERBIN
Redefine CUPS_SERVERBIN to "$libexecdir/cups" for cups which solves file
confliction when multilib is enabled.
| Error: Transaction check error:
| file /lib/systemd/system/org.cups.cups-lpd at .service conflicts between
attempted installs of cups-2.2.11-r0.core2_64 and lib32-cups-2.2.11-r0.core2_32
Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-extended/cups/cups.inc | 2 +-
meta/recipes-extended/cups/cups/cups_serverbin.patch | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 46fb2dd..e303f34 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -67,7 +67,7 @@ do_install () {
# Remove /var/run from package as cupsd will populate it on startup
rm -fr ${D}/${localstatedir}/run
- rmdir ${D}/${libdir}/${BPN}/driver
+ rmdir ${D}/${libexecdir}/${BPN}/driver
# Fix the pam configuration file permissions
if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
diff --git a/meta/recipes-extended/cups/cups/cups_serverbin.patch b/meta/recipes-extended/cups/cups/cups_serverbin.patch
index f7b44a7..85c6af1 100644
--- a/meta/recipes-extended/cups/cups/cups_serverbin.patch
+++ b/meta/recipes-extended/cups/cups/cups_serverbin.patch
@@ -4,6 +4,12 @@ e.g. ppc64 where base libdir is lib64 this does not go well
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Upstream-Status: Inappropriate [OE config specific]
+Update on 20190904:
+Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction
+when multilib is enabled.
+
+Signed-off-by: Kai Kang <kai.kang at windriver.com>
+
Index: cups-1.4.6/config-scripts/cups-directories.m4
===================================================================
--- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700
@@ -13,7 +19,7 @@ Index: cups-1.4.6/config-scripts/cups-directories.m4
# All others
INSTALL_SYSV="install-sysv"
- CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+ CUPS_SERVERBIN="$libdir/cups"
++ CUPS_SERVERBIN="$libexecdir/cups"
;;
esac
@@ -26,7 +32,7 @@ Index: cups-1.4.6/configure
# All others
INSTALL_SYSV="install-sysv"
- CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+ CUPS_SERVERBIN="$libdir/cups"
++ CUPS_SERVERBIN="$libexecdir/cups"
;;
esac
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list