diff options
author | ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
---|---|---|
committer | ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
commit | 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd (patch) | |
tree | b4bb18dcd1487dbf1ea8127e5671b7bb2eded033 /external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch | |
parent | 706ad73eb02caf8532deaf5d38995bd258725cb8 (diff) |
agl-basesystem
Diffstat (limited to 'external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch')
-rw-r--r-- | external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch b/external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch new file mode 100644 index 00000000..68885fa4 --- /dev/null +++ b/external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch @@ -0,0 +1,21 @@ +@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@ |