diff options
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 3 | ||||
-rw-r--r-- | meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 717eef03a7..c142a4d990 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -8,7 +8,8 @@ SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.t | |||
8 | file://use_echo_only_in_init.patch \ | 8 | file://use_echo_only_in_init.patch \ |
9 | file://0001-don-t-try-to-run-generated-binaries.patch \ | 9 | file://0001-don-t-try-to-run-generated-binaries.patch \ |
10 | file://cups_serverbin.patch \ | 10 | file://cups_serverbin.patch \ |
11 | " | 11 | file://cups-avoid-install-file-conflicts.patch \ |
12 | " | ||
12 | 13 | ||
13 | UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" | 14 | UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" |
14 | UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" | 15 | UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" |
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@ | ||