diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2019-09-04 05:35:53 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-07 07:47:14 +0100 |
| commit | 274bed042b9c2b50a8bdd11b42f1a62405fb5b11 (patch) | |
| tree | e10c86642d1756a1f32c8457dab24f50bb9ce3d1 | |
| parent | e45c06fe6f9a21c2cd06ae003cb112556382f81e (diff) | |
| download | openembedded-core-contrib-274bed042b9c2b50a8bdd11b42f1a62405fb5b11.tar.gz | |
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@.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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/cups/cups.inc | 2 | ||||
| -rw-r--r-- | 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 46fb2dded3..e303f3424d 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 f7b44a7bc1..85c6af1071 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@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@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 |