mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

cups: redefine CUPS_SERVERBIN

Browse Source 
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>
This commit is contained in:
Kai Kang
2019-09-04 05:35:53 -04:00
committed by Richard Purdie
parent 7379b6347b
commit 944a5b054c
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/cups/cups.inc
+1 -1
View File
@@ -67,7 +67,7 @@ do_install () {
# Remove /var/run from package as cupsd will populate it on startup # Remove /var/run from package as cupsd will populate it on startup
rm -fr ${D}/${localstatedir}/run rm -fr ${D}/${localstatedir}/run
rmdir ${D}/${libdir}/${BPN}/driver rmdir ${D}/${libexecdir}/${BPN}/driver
# Fix the pam configuration file permissions # Fix the pam configuration file permissions
if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
meta/recipes-extended/cups/cups/cups_serverbin.patch
+8 -2
View File
@@ -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> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Inappropriate [OE config specific] 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 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 --- 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 # All others
INSTALL_SYSV="install-sysv" INSTALL_SYSV="install-sysv"
- CUPS_SERVERBIN="$exec_prefix/lib/cups" - CUPS_SERVERBIN="$exec_prefix/lib/cups"
+ CUPS_SERVERBIN="$libdir/cups" + CUPS_SERVERBIN="$libexecdir/cups"
;; ;;
esac esac
@@ -26,7 +32,7 @@ Index: cups-1.4.6/configure
# All others # All others
INSTALL_SYSV="install-sysv" INSTALL_SYSV="install-sysv"
- CUPS_SERVERBIN="$exec_prefix/lib/cups" - CUPS_SERVERBIN="$exec_prefix/lib/cups"
+ CUPS_SERVERBIN="$libdir/cups" + CUPS_SERVERBIN="$libexecdir/cups"
;; ;;
esac esac