diff options
Diffstat (limited to 'meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch')
-rw-r--r-- | meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch b/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch new file mode 100644 index 0000000000..68885fa4db --- /dev/null +++ b/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | @CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file | ||
2 | conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to | ||
3 | avoid the conflict. | ||
4 | |||
5 | Upstream-Status: Inappropriate [OE specific] | ||
6 | |||
7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
8 | |||
9 | diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in | ||
10 | index 4a78ba6..03c6582 100644 | ||
11 | --- a/conf/cups-files.conf.in | ||
12 | +++ b/conf/cups-files.conf.in | ||
13 | @@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log | ||
14 | #RequestRoot @CUPS_REQUESTS@ | ||
15 | |||
16 | # Location of helper programs... | ||
17 | -#ServerBin @CUPS_SERVERBIN@ | ||
18 | +#ServerBin | ||
19 | |||
20 | # SSL/TLS keychain for the scheduler... | ||
21 | #ServerKeychain @CUPS_SERVERKEYCHAIN@ | ||