diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-10-03 00:27:11 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-04 14:21:41 +0100 |
commit | 9f28e2d38062e4347a4e2134dee3a12e291c469f (patch) | |
tree | 576fb3fc57f3a738c744a7ab9dacc195f9092fd9 /meta/recipes-extended/cups/cups.inc | |
parent | 32874084cefbe22f3294625859c5335096c670f2 (diff) | |
download | poky-9f28e2d38062e4347a4e2134dee3a12e291c469f.tar.gz |
cups: fix multilib install file conflicts
A comment line of conf file cups-files.conf refers to var @CUPS_SERVERBIN@
is ${libdir} related and then it causes multilib install file conflict.
Remove @CUPS_SERVERBIN@ from the comment line to avoid the conflict.
(From OE-Core rev: ac4df3f83fccfa7dd75d6a913b7ab75e49a7b986)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups/cups.inc')
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 3 |
1 files changed, 2 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" |