diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-12 17:29:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-28 23:25:42 +0000 |
commit | 53e3605eae85116a0ad7ebe0de608ad2c82d8b35 (patch) | |
tree | 310d4c19ad1ca73ca54ffd2617d9bab46ebd1b45 /meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch | |
parent | 098b39dc40e71a370ddd73e6f6707e537a012958 (diff) | |
download | poky-53e3605eae85116a0ad7ebe0de608ad2c82d8b35.tar.gz |
cups: update to 2.3.1
License-Update: license changed to Apache 2.0
Remove no longer recognized configure options.
Refresh all patches.
(From OE-Core rev: 7ed28276e9fa6fc9b572bdf1ad566967964d9623)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch')
-rw-r--r-- | meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch new file mode 100644 index 0000000000..bc9260307c --- /dev/null +++ b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch | |||
@@ -0,0 +1,33 @@ | |||
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 | |||