| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Wed, 3 Oct 2018 00:27:11 +0800 |
| 4 | Subject: [PATCH 4/4] cups: fix multilib install file conflicts |
| 5 | |
| 6 | @CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file |
| 7 | conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to |
| 8 | avoid the conflict. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [OE specific] |
| 11 | |
| 12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 13 | |
| 14 | --- |
| 15 | conf/cups-files.conf.in | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in |
| 19 | index 4a78ba6..03c6582 100644 |
| 20 | --- a/conf/cups-files.conf.in |
| 21 | +++ b/conf/cups-files.conf.in |
| 22 | @@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log |
| 23 | #RequestRoot @CUPS_REQUESTS@ |
| 24 | |
| 25 | # Location of helper programs... |
| 26 | -#ServerBin @CUPS_SERVERBIN@ |
| 27 | +#ServerBin |
| 28 | |
| 29 | # SSL/TLS keychain for the scheduler... |
| 30 | #ServerKeychain @CUPS_SERVERKEYCHAIN@ |
| 31 | -- |
| 32 | 2.17.1 |
| 33 | |