summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-09-04 05:35:53 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-07 07:47:24 +0100
commit944a5b054c8a142ef524bafb228f2c79d55372e9 (patch)
tree36578709ed2c3b7228bd83d06efa01624f8e9265 /meta/recipes-extended
parent7379b6347b53c198ad6ce7bc8a65639a909efe36 (diff)
downloadpoky-944a5b054c8a142ef524bafb228f2c79d55372e9.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 (From OE-Core rev: 274bed042b9c2b50a8bdd11b42f1a62405fb5b11) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/cups/cups.inc2
-rw-r--r--meta/recipes-extended/cups/cups/cups_serverbin.patch10
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 () {
67 67
68 # Remove /var/run from package as cupsd will populate it on startup 68 # Remove /var/run from package as cupsd will populate it on startup
69 rm -fr ${D}/${localstatedir}/run 69 rm -fr ${D}/${localstatedir}/run
70 rmdir ${D}/${libdir}/${BPN}/driver 70 rmdir ${D}/${libexecdir}/${BPN}/driver
71 71
72 # Fix the pam configuration file permissions 72 # Fix the pam configuration file permissions
73 if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then 73 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
4Signed-off-by: Khem Raj <raj.khem@gmail.com> 4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Inappropriate [OE config specific] 5Upstream-Status: Inappropriate [OE config specific]
6 6
7Update on 20190904:
8Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction
9when multilib is enabled.
10
11Signed-off-by: Kai Kang <kai.kang@windriver.com>
12
7Index: cups-1.4.6/config-scripts/cups-directories.m4 13Index: cups-1.4.6/config-scripts/cups-directories.m4
8=================================================================== 14===================================================================
9--- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700 15--- 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
13 # All others 19 # All others
14 INSTALL_SYSV="install-sysv" 20 INSTALL_SYSV="install-sysv"
15- CUPS_SERVERBIN="$exec_prefix/lib/cups" 21- CUPS_SERVERBIN="$exec_prefix/lib/cups"
16+ CUPS_SERVERBIN="$libdir/cups" 22+ CUPS_SERVERBIN="$libexecdir/cups"
17 ;; 23 ;;
18 esac 24 esac
19 25
@@ -26,7 +32,7 @@ Index: cups-1.4.6/configure
26 # All others 32 # All others
27 INSTALL_SYSV="install-sysv" 33 INSTALL_SYSV="install-sysv"
28- CUPS_SERVERBIN="$exec_prefix/lib/cups" 34- CUPS_SERVERBIN="$exec_prefix/lib/cups"
29+ CUPS_SERVERBIN="$libdir/cups" 35+ CUPS_SERVERBIN="$libexecdir/cups"
30 ;; 36 ;;
31 esac 37 esac
32 38