* [PATCH v2 0/3] Fix multilib file conflictions
@ 2019-09-04 9:35 kai.kang
2019-09-04 9:35 ` [PATCH v2 1/3] cups: redefine CUPS_SERVERBIN kai.kang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: kai.kang @ 2019-09-04 9:35 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
v2:
* don't remove sysstat.service from sysstat
Kai Kang (3):
cups: redefine CUPS_SERVERBIN
texinfo: fix multilib file confliction
sysstat: 12.1.3 -> 12.1.6
meta/recipes-extended/cups/cups.inc | 2 +-
meta/recipes-extended/cups/cups/cups_serverbin.patch | 10 ++++++++--
meta/recipes-extended/sysstat/sysstat.inc | 4 ++--
.../sysstat/{sysstat_12.1.3.bb => sysstat_12.1.6.bb} | 4 ++--
meta/recipes-extended/texinfo/texinfo_6.5.bb | 4 +++-
5 files changed, 16 insertions(+), 8 deletions(-)
rename meta/recipes-extended/sysstat/{sysstat_12.1.3.bb => sysstat_12.1.6.bb} (53%)
--
2.20.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/3] cups: redefine CUPS_SERVERBIN
2019-09-04 9:35 [PATCH v2 0/3] Fix multilib file conflictions kai.kang
@ 2019-09-04 9:35 ` kai.kang
2019-09-04 9:35 ` [PATCH v2 2/3] texinfo: fix multilib file confliction kai.kang
2019-09-04 9:35 ` [PATCH v2 3/3] sysstat: 12.1.3 -> 12.1.6 kai.kang
2 siblings, 0 replies; 4+ messages in thread
From: kai.kang @ 2019-09-04 9:35 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Redefine CUPS_SERVERBIN to "$libexecdir/cups" for cups which solves file
confliction when multilib is enabled.
| Error: Transaction check error:
| file /lib/systemd/system/org.cups.cups-lpd@.service conflicts between
attempted installs of cups-2.2.11-r0.core2_64 and lib32-cups-2.2.11-r0.core2_32
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-extended/cups/cups.inc | 2 +-
meta/recipes-extended/cups/cups/cups_serverbin.patch | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 46fb2dded3..e303f3424d 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -67,7 +67,7 @@ do_install () {
# Remove /var/run from package as cupsd will populate it on startup
rm -fr ${D}/${localstatedir}/run
- rmdir ${D}/${libdir}/${BPN}/driver
+ rmdir ${D}/${libexecdir}/${BPN}/driver
# Fix the pam configuration file permissions
if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
diff --git a/meta/recipes-extended/cups/cups/cups_serverbin.patch b/meta/recipes-extended/cups/cups/cups_serverbin.patch
index f7b44a7bc1..85c6af1071 100644
--- a/meta/recipes-extended/cups/cups/cups_serverbin.patch
+++ b/meta/recipes-extended/cups/cups/cups_serverbin.patch
@@ -4,6 +4,12 @@ e.g. ppc64 where base libdir is lib64 this does not go well
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Inappropriate [OE config specific]
+Update on 20190904:
+Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction
+when multilib is enabled.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
Index: cups-1.4.6/config-scripts/cups-directories.m4
===================================================================
--- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700
@@ -13,7 +19,7 @@ Index: cups-1.4.6/config-scripts/cups-directories.m4
# All others
INSTALL_SYSV="install-sysv"
- CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+ CUPS_SERVERBIN="$libdir/cups"
++ CUPS_SERVERBIN="$libexecdir/cups"
;;
esac
@@ -26,7 +32,7 @@ Index: cups-1.4.6/configure
# All others
INSTALL_SYSV="install-sysv"
- CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+ CUPS_SERVERBIN="$libdir/cups"
++ CUPS_SERVERBIN="$libexecdir/cups"
;;
esac
--
2.20.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/3] texinfo: fix multilib file confliction
2019-09-04 9:35 [PATCH v2 0/3] Fix multilib file conflictions kai.kang
2019-09-04 9:35 ` [PATCH v2 1/3] cups: redefine CUPS_SERVERBIN kai.kang
@ 2019-09-04 9:35 ` kai.kang
2019-09-04 9:35 ` [PATCH v2 3/3] sysstat: 12.1.3 -> 12.1.6 kai.kang
2 siblings, 0 replies; 4+ messages in thread
From: kai.kang @ 2019-09-04 9:35 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Inherit multilib_script to fix file confliction when mutlilib enabled.
| Error: Transaction check error:
| file /usr/bin/texi2any conflicts between attempted installs of
lib32-texinfo-6.5-r0.core2_32 and texinfo-6.5-r0.core2_64
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-extended/texinfo/texinfo_6.5.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/texinfo/texinfo_6.5.bb b/meta/recipes-extended/texinfo/texinfo_6.5.bb
index f966457f88..50eae77ad0 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.5.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.5.bb
@@ -42,7 +42,9 @@ SRC_URI[sha256sum] = "d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec
tex_texinfo = "texmf/tex/texinfo"
-inherit gettext autotools
+inherit gettext autotools multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any"
EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
--
2.20.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 3/3] sysstat: 12.1.3 -> 12.1.6
2019-09-04 9:35 [PATCH v2 0/3] Fix multilib file conflictions kai.kang
2019-09-04 9:35 ` [PATCH v2 1/3] cups: redefine CUPS_SERVERBIN kai.kang
2019-09-04 9:35 ` [PATCH v2 2/3] texinfo: fix multilib file confliction kai.kang
@ 2019-09-04 9:35 ` kai.kang
2 siblings, 0 replies; 4+ messages in thread
From: kai.kang @ 2019-09-04 9:35 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Update sysstat from 12.1.3 to 12.1.6.
* make sa_lib_dir refer to ${libexecdir}/sa to fix conflictions when
multilib is enabled
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-extended/sysstat/sysstat.inc | 4 ++--
.../sysstat/{sysstat_12.1.3.bb => sysstat_12.1.6.bb} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-extended/sysstat/{sysstat_12.1.3.bb => sysstat_12.1.6.bb} (53%)
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 592cbf4574..5a7d2114ca 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/"
LICENSE = "GPLv2+"
SECTION = "console/utils"
-SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \
+SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \
file://99_sysstat \
file://sysstat.service \
"
@@ -29,7 +29,7 @@ SYSTEMD_SERVICE_${PN} = "sysstat.service"
SYSTEMD_AUTO_ENABLE = "enable"
do_configure_prepend() {
- export sa_lib_dir=${libdir}/sa
+ export sa_lib_dir=${libexecdir}/sa
}
do_install() {
diff --git a/meta/recipes-extended/sysstat/sysstat_12.1.3.bb b/meta/recipes-extended/sysstat/sysstat_12.1.6.bb
similarity index 53%
rename from meta/recipes-extended/sysstat/sysstat_12.1.3.bb
rename to meta/recipes-extended/sysstat/sysstat_12.1.6.bb
index 5daf3f45f5..8cf8c36d9b 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.1.3.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.1.6.bb
@@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
SRC_URI += "file://0001-Include-needed-headers-explicitly.patch"
-SRC_URI[md5sum] = "0f9b73f60aba6fd49de346bc384902c3"
-SRC_URI[sha256sum] = "55498bf82755ba9fed3e7df61fd26f8f50dd3e7b3b229c731029a4c8ab51a1aa"
+SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570"
+SRC_URI[sha256sum] = "f752f3c406153a6fc446496f1102872505ace3f0931d975c1d664c81ec09f129"
--
2.20.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-04 9:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-04 9:35 [PATCH v2 0/3] Fix multilib file conflictions kai.kang
2019-09-04 9:35 ` [PATCH v2 1/3] cups: redefine CUPS_SERVERBIN kai.kang
2019-09-04 9:35 ` [PATCH v2 2/3] texinfo: fix multilib file confliction kai.kang
2019-09-04 9:35 ` [PATCH v2 3/3] sysstat: 12.1.3 -> 12.1.6 kai.kang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.