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, 0 insertions, 21 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 deleted file mode 100644 index 68885fa4db..0000000000 --- a/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch +++ /dev/null @@ -1,21 +0,0 @@ -@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@ |