* [PATCH 1/4] cups: fix multilib install file conflicts
2018-10-02 16:27 [PATCH v3 0/4] Fix multilib install conflicts kai.kang
@ 2018-10-02 16:27 ` kai.kang
2018-10-02 16:27 ` [PATCH 2/4] man-db: fix multilib install file conflict kai.kang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: kai.kang @ 2018-10-02 16:27 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
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.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-extended/cups/cups.inc | 3 ++-
.../cups-avoid-install-file-conflicts.patch | 21 +++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch
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
file://use_echo_only_in_init.patch \
file://0001-don-t-try-to-run-generated-binaries.patch \
file://cups_serverbin.patch \
- "
+ file://cups-avoid-install-file-conflicts.patch \
+ "
UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases"
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 @@
+@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@
--
2.18.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/4] man-db: fix multilib install file conflict
2018-10-02 16:27 [PATCH v3 0/4] Fix multilib install conflicts kai.kang
2018-10-02 16:27 ` [PATCH 1/4] cups: fix multilib install file conflicts kai.kang
@ 2018-10-02 16:27 ` kai.kang
2018-10-02 16:27 ` [PATCH 3/4] libcheck: avoid " kai.kang
2018-10-02 16:27 ` [PATCH 4/4] os-release: avoid multilib expand kai.kang
3 siblings, 0 replies; 5+ messages in thread
From: kai.kang @ 2018-10-02 16:27 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
The first line of config file man_db.conf is the package name. It causes
multilib install file conflict. So add a patch to remove the line.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
...nf-avoid-multilib-install-file-conflict.patch | 16 ++++++++++++++++
meta/recipes-extended/man-db/man-db_2.8.3.bb | 3 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch
diff --git a/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch b/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch
new file mode 100644
index 0000000000..03273d3b49
--- /dev/null
+++ b/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch
@@ -0,0 +1,16 @@
+The first line of man_db.conf will be replaced by package name. And it causes
+multilib install file conflict. Remove the line to avoid the issue.
+
+Upstream-Status: Pending
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+diff --git a/src/man_db.conf.in b/src/man_db.conf.in
+index bc8bb7e..04cfb31 100644
+--- a/src/man_db.conf.in
++++ b/src/man_db.conf.in
+@@ -1,4 +1,3 @@
+-# @config_file_basename@
+ #
+ # This file is used by the man-db package to configure the man and cat paths.
+ # It is also used to provide a manpath for those without one by examining
diff --git a/meta/recipes-extended/man-db/man-db_2.8.3.bb b/meta/recipes-extended/man-db/man-db_2.8.3.bb
index 97e5a3d6fb..cd8d27c33e 100644
--- a/meta/recipes-extended/man-db/man-db_2.8.3.bb
+++ b/meta/recipes-extended/man-db/man-db_2.8.3.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343
file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
- file://99_mandb"
+ file://99_mandb \
+ file://man_db.conf-avoid-multilib-install-file-conflict.patch"
SRC_URI[md5sum] = "6f3055e18fdd1ce5cbbdb30403991ec7"
SRC_URI[sha256sum] = "5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac"
--
2.18.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] libcheck: avoid multilib install file conflict
2018-10-02 16:27 [PATCH v3 0/4] Fix multilib install conflicts kai.kang
2018-10-02 16:27 ` [PATCH 1/4] cups: fix multilib install file conflicts kai.kang
2018-10-02 16:27 ` [PATCH 2/4] man-db: fix multilib install file conflict kai.kang
@ 2018-10-02 16:27 ` kai.kang
2018-10-02 16:27 ` [PATCH 4/4] os-release: avoid multilib expand kai.kang
3 siblings, 0 replies; 5+ messages in thread
From: kai.kang @ 2018-10-02 16:27 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
The first line of output of '$CC --version' is written to check_stdint.h
as a comment line. It causes multilib install file conflict.
Do not echo compiler version info to check_stdint.h to fix the issue.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
...echo-compiler-info-to-check_stdint.h.patch | 19 +++++++++++++++++++
.../libcheck/libcheck_0.12.0.bb | 3 ++-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch
diff --git a/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch b/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch
new file mode 100644
index 0000000000..3c7572700d
--- /dev/null
+++ b/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch
@@ -0,0 +1,19 @@
+Do not echo compiler info in a comment line to check_stdint.h which causes
+multilib install file conflict.
+
+Upstream-Status: Pending
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4
+index 33a21f8..eacc37a 100644
+--- a/m4/ax_create_stdint_h.m4
++++ b/m4/ax_create_stdint_h.m4
+@@ -272,7 +272,6 @@ echo "#ifndef" $_ac_stdint_h >$ac_stdint
+ echo "#define" $_ac_stdint_h "1" >>$ac_stdint
+ echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint
+ echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint
+-echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint
+ if test "_$ac_cv_header_stdint_t" != "_" ; then
+ echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint
+ echo "#include <stdint.h>" >>$ac_stdint
diff --git a/meta/recipes-support/libcheck/libcheck_0.12.0.bb b/meta/recipes-support/libcheck/libcheck_0.12.0.bb
index e646d43968..3bb48a75a3 100644
--- a/meta/recipes-support/libcheck/libcheck_0.12.0.bb
+++ b/meta/recipes-support/libcheck/libcheck_0.12.0.bb
@@ -5,7 +5,8 @@ SECTION = "devel"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
-SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz"
+SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \
+ file://not-echo-compiler-info-to-check_stdint.h.patch"
SRC_URI[md5sum] = "31b17c6075820a434119592941186f70"
SRC_URI[sha256sum] = "464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234"
UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/"
--
2.18.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] os-release: avoid multilib expand
2018-10-02 16:27 [PATCH v3 0/4] Fix multilib install conflicts kai.kang
` (2 preceding siblings ...)
2018-10-02 16:27 ` [PATCH 3/4] libcheck: avoid " kai.kang
@ 2018-10-02 16:27 ` kai.kang
3 siblings, 0 replies; 5+ messages in thread
From: kai.kang @ 2018-10-02 16:27 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Add os-release to NON_MULTILIB_RECIPES in multilib.conf that do not do
multilib expand for os-release.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/conf/multilib.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 65a28ddbd2..ccca29b854 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -29,4 +29,4 @@ PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkg
# These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES
# ${MLPREFIX}${BPN}
-NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts"
+NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts os-release"
--
2.18.0
^ permalink raw reply related [flat|nested] 5+ messages in thread