summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-10-03 00:27:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-04 14:21:41 +0100
commit9f28e2d38062e4347a4e2134dee3a12e291c469f (patch)
tree576fb3fc57f3a738c744a7ab9dacc195f9092fd9
parent32874084cefbe22f3294625859c5335096c670f2 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-extended/cups/cups.inc3
-rw-r--r--meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch21
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
13UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" 14UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases"
14UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" 15UPSTREAM_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
2conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to
3avoid the conflict.
4
5Upstream-Status: Inappropriate [OE specific]
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8
9diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
10index 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@