summaryrefslogtreecommitdiffstats
path: root/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch
blob: 68885fa4db0fc3d5cfc40a883b890309054b27bd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
@CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file
conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to
avoid the conflict.

Upstream-Status: Inappropriate [OE specific]

Signed-off-by: Kai Kang <kai.kang@windriver.com>

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba6..03c6582 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log
 #RequestRoot @CUPS_REQUESTS@
 
 # Location of helper programs...
-#ServerBin @CUPS_SERVERBIN@
+#ServerBin
 
 # SSL/TLS keychain for the scheduler...
 #ServerKeychain @CUPS_SERVERKEYCHAIN@
OpenPOWER on IntegriCloud