[OE-core] [PATCH] util-linux: replace package files

2013-05-16 Thread Zhang Xiao 
Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM
package to related library's dev RPM packages.

[YOCTO #4500]
[CQID: WIND00412705]

Signed-off-by: Zhang Xiao xiao.zh...@windriver.com
---
 .../util-linux-replace-package-files.patch |   56 
 meta/recipes-core/util-linux/util-linux_2.22.2.bb  |1 +
 2 files changed, 57 insertions(+), 0 deletions(-)
 create mode 100644 
meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch

diff --git 
a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch
 
b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch
new file mode 100644
index 000..32868cc
--- /dev/null
+++ 
b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch
@@ -0,0 +1,56 @@
+Upstream-Status: Pending
+Signed-off-by: Zhang Xiao xiao.zh...@windriver.com 
+
+Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM
+package to related library's dev RPM packages.
+---
+ libblkid/src/Makemodule.am |6 +-
+ libmount/src/Makemodule.am |6 +-
+ libuuid/src/Makemodule.am  |6 +-
+ 3 files changed, 3 insertions(+), 15 deletions(-)
+
+--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig
 util-linux-2.22.2/libuuid/src/Makemodule.am
+@@ -42,11 +42,7 @@ install-exec-hook-libuuid:
+   if test $(usrlib_execdir) != $(libdir); then \
+   mkdir -p $(DESTDIR)$(libdir); \
+   mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* 
$(DESTDIR)$(libdir); \
+-  so_img_name=$$(readlink 
$(DESTDIR)$(usrlib_execdir)/libuuid.so); \
+-  so_img_rel_target=$$(echo $(usrlib_execdir) | sed 
's,\(^/\|\)[^/][^/]*,..,g'); \
+-  (cd $(DESTDIR)$(usrlib_execdir)  \
+-  rm -f libuuid.so  \
+-  $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name 
libuuid.so); \
++  mv $(DESTDIR)$(usrlib_execdir)/libuuid.so $(DESTDIR)$(libdir); \
+   fi
+ 
+ uninstall-hook-libuuid:
+--- util-linux-2.22.2/libmount/src/Makemodule.am.orig
 util-linux-2.22.2/libmount/src/Makemodule.am
+@@ -123,11 +123,7 @@ install-exec-hook-libmount:
+   if test $(usrlib_execdir) != $(libdir); then \
+   mkdir -p $(DESTDIR)$(libdir); \
+   mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* 
$(DESTDIR)$(libdir); \
+-  so_img_name=$$(readlink 
$(DESTDIR)$(usrlib_execdir)/libmount.so); \
+-  so_img_rel_target=$$(echo $(usrlib_execdir) | sed 
's,\(^/\|\)[^/][^/]*,..,g'); \
+-  (cd $(DESTDIR)$(usrlib_execdir)  \
+-  rm -f libmount.so  \
+-  $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name 
libmount.so); \
++  mv $(DESTDIR)$(usrlib_execdir)/libmount.so $(DESTDIR)$(libdir); 
\
+   fi
+ 
+ uninstall-hook-libmount:
+--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig
 util-linux-2.22.2/libblkid/src/Makemodule.am
+@@ -219,11 +219,7 @@ install-exec-hook-libblkid:
+   if test $(usrlib_execdir) != $(libdir); then \
+   mkdir -p $(DESTDIR)$(libdir); \
+   mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* 
$(DESTDIR)$(libdir); \
+-  so_img_name=$$(readlink 
$(DESTDIR)$(usrlib_execdir)/libblkid.so); \
+-  so_img_rel_target=$$(echo $(usrlib_execdir) | sed 
's,\(^/\|\)[^/][^/]*,..,g'); \
+-  (cd $(DESTDIR)$(usrlib_execdir)  \
+-  rm -f libblkid.so  \
+-  $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name 
libblkid.so); \
++  mv $(DESTDIR)$(usrlib_execdir)/libblkid.so $(DESTDIR)$(libdir); 
\
+   fi
+ 
+ uninstall-hook-libblkid:
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb 
b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
index 43a55a6..526308d 100644
--- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
@@ -8,6 +8,7 @@ SRC_URI += file://util-linux-ng-replace-siginterrupt.patch \
 file://configure-sbindir.patch \
 file://fix-configure.patch \
 file://mbsalign-license.patch \
+file://util-linux-replace-package-files.patch \
 
 
 SRC_URI[md5sum] = 3e379b4d8b9693948d751c154614c73e
-- 
1.7.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] util-linux: replace package files

2013-05-16 Thread Zhang Xiao 
Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM
package to related library's dev RPM packages.

[YOCTO #4500]
[CQID: WIND00412705]

Signed-off-by: Zhang Xiao xiao.zh...@windriver.com
---
 .../util-linux-replace-package-files.patch |   56 
 meta/recipes-core/util-linux/util-linux_2.22.2.bb  |1 +
 2 files changed, 57 insertions(+), 0 deletions(-)
 create mode 100644 
meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch

diff --git 
a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch
 
b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch
new file mode 100644
index 000..32868cc
--- /dev/null
+++ 
b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch
@@ -0,0 +1,56 @@
+Upstream-Status: Pending
+Signed-off-by: Zhang Xiao xiao.zh...@windriver.com 
+
+Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM
+package to related library's dev RPM packages.
+---
+ libblkid/src/Makemodule.am |6 +-
+ libmount/src/Makemodule.am |6 +-
+ libuuid/src/Makemodule.am  |6 +-
+ 3 files changed, 3 insertions(+), 15 deletions(-)
+
+--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig
 util-linux-2.22.2/libuuid/src/Makemodule.am
+@@ -42,11 +42,7 @@ install-exec-hook-libuuid:
+   if test $(usrlib_execdir) != $(libdir); then \
+   mkdir -p $(DESTDIR)$(libdir); \
+   mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* 
$(DESTDIR)$(libdir); \
+-  so_img_name=$$(readlink 
$(DESTDIR)$(usrlib_execdir)/libuuid.so); \
+-  so_img_rel_target=$$(echo $(usrlib_execdir) | sed 
's,\(^/\|\)[^/][^/]*,..,g'); \
+-  (cd $(DESTDIR)$(usrlib_execdir)  \
+-  rm -f libuuid.so  \
+-  $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name 
libuuid.so); \
++  mv $(DESTDIR)$(usrlib_execdir)/libuuid.so $(DESTDIR)$(libdir); \
+   fi
+ 
+ uninstall-hook-libuuid:
+--- util-linux-2.22.2/libmount/src/Makemodule.am.orig
 util-linux-2.22.2/libmount/src/Makemodule.am
+@@ -123,11 +123,7 @@ install-exec-hook-libmount:
+   if test $(usrlib_execdir) != $(libdir); then \
+   mkdir -p $(DESTDIR)$(libdir); \
+   mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* 
$(DESTDIR)$(libdir); \
+-  so_img_name=$$(readlink 
$(DESTDIR)$(usrlib_execdir)/libmount.so); \
+-  so_img_rel_target=$$(echo $(usrlib_execdir) | sed 
's,\(^/\|\)[^/][^/]*,..,g'); \
+-  (cd $(DESTDIR)$(usrlib_execdir)  \
+-  rm -f libmount.so  \
+-  $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name 
libmount.so); \
++  mv $(DESTDIR)$(usrlib_execdir)/libmount.so $(DESTDIR)$(libdir); 
\
+   fi
+ 
+ uninstall-hook-libmount:
+--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig
 util-linux-2.22.2/libblkid/src/Makemodule.am
+@@ -219,11 +219,7 @@ install-exec-hook-libblkid:
+   if test $(usrlib_execdir) != $(libdir); then \
+   mkdir -p $(DESTDIR)$(libdir); \
+   mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* 
$(DESTDIR)$(libdir); \
+-  so_img_name=$$(readlink 
$(DESTDIR)$(usrlib_execdir)/libblkid.so); \
+-  so_img_rel_target=$$(echo $(usrlib_execdir) | sed 
's,\(^/\|\)[^/][^/]*,..,g'); \
+-  (cd $(DESTDIR)$(usrlib_execdir)  \
+-  rm -f libblkid.so  \
+-  $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name 
libblkid.so); \
++  mv $(DESTDIR)$(usrlib_execdir)/libblkid.so $(DESTDIR)$(libdir); 
\
+   fi
+ 
+ uninstall-hook-libblkid:
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb 
b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
index 43a55a6..526308d 100644
--- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
@@ -8,6 +8,7 @@ SRC_URI += file://util-linux-ng-replace-siginterrupt.patch \
 file://configure-sbindir.patch \
 file://fix-configure.patch \
 file://mbsalign-license.patch \
+file://util-linux-replace-package-files.patch \
 
 
 SRC_URI[md5sum] = 3e379b4d8b9693948d751c154614c73e
-- 
1.7.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] nfs-utils: separate package as Debain style

2013-11-21 Thread Zhang Xiao 
Move binaries used for both nfs client and server into client
package. Add an init script for client package and move
necessary progress from server's init script to this one. Make
client package more powerful and let server package depends on
client one, as Debain does.

Signed-off-by: Zhang Xiao xiao.zh...@windriver.com
---
 .../nfs-utils/nfs-utils/nfscommon  | 90 ++
 .../nfs-utils/nfs-utils/nfsserver  | 46 +--
 .../nfs-utils/nfs-utils_1.2.9.bb   | 27 +--
 3 files changed, 114 insertions(+), 49 deletions(-)
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
new file mode 100644
index 000..c949b96
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
@@ -0,0 +1,90 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:  nfs-common
+# Required-Start:$portmap hwclock
+# Required-Stop: $portmap hwclock
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: NFS support for both client and server
+# Description:   NFS is a popular protocol for file sharing across
+#TCP/IP networks. This service provides various
+#support functions for NFS mounts.
+### END INIT INFO
+#
+# Startup script for nfs-utils
+#
+#
+# Location of executables:
+
+# Source function library.
+. /etc/init.d/functions
+
+test -x $NFS_STATD || NFS_STATD=/usr/sbin/rpc.statd
+test -z $STATD_PID  STATD_PID=/var/run/rpc.statd.pid
+#
+# The default state directory is /var/lib/nfs
+test -n $NFS_STATEDIR || NFS_STATEDIR=/var/lib/nfs
+#
+#--
+# Startup and shutdown functions.
+#  Actual startup/shutdown is at the end of this file.
+#directories
+create_directories(){
+   echo -n 'creating NFS state directory: '
+   mkdir -p $NFS_STATEDIR
+   (   cd $NFS_STATEDIR
+   umask 077
+   mkdir -p rpc_pipefs
+   mkdir -p sm sm.bak statd
+   chown rpcuser sm sm.bak statd
+   test -w statd/state || {
+   rm -f statd/state
+   :statd/state
+   }
+   umask 022
+   for file in xtab etab smtab rmtab
+   do
+   test -w $file || {
+   rm -f $file
+   :$file
+   }
+   done
+   )
+   chown rpcuser $NFS_STATEDIR
+   echo done
+}
+
+#statd
+start_statd(){
+   echo -n starting statd: 
+   start-stop-daemon --start --exec $NFS_STATD --pidfile $STATD_PID
+   echo done
+}
+stop_statd(){
+   echo -n 'stopping statd: '
+   start-stop-daemon --stop --quiet --signal 1 --pidfile $STATD_PID
+   echo done
+}
+#--
+#
+# supported options:
+#  start
+#  stop
+#  restart: stops and starts mountd
+#FIXME: need to create the /var/lib/nfs/... directories
+case $1 in
+  start)
+   create_directories
+   start_statd;;
+  stop)
+   stop_statd;;
+  status)
+   status $NFS_STATD
+   exit $?;;
+  restart)
+   $0 stop
+   $0 start;;
+  *)
+   echo Usage: $0 {start|stop|status|restart}
+   exit 1;;
+esac
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index c263f14..6e0df7e 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
@@ -1,8 +1,8 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:  nfs-kernel-server
-# Required-Start:$remote_fs $portmap hwclock
-# Required-Stop: $remote_fs $portmap hwclock
+# Required-Start:$remote_fs nfs-common $portmap hwclock
+# Required-Stop: $remote_fs nfs-common $portmap hwclock
 # Default-Start: 2 3 4 5
 # Default-Stop:  0 1 6
 # Short-Description: Kernel NFS server support
@@ -24,8 +24,6 @@ test -r /etc/default/nfsd  . /etc/default/nfsd
 # Location of executables:
 test -x $NFS_MOUNTD || NFS_MOUNTD=/usr/sbin/rpc.mountd
 test -x $NFS_NFSD || NFS_NFSD=/usr/sbin/rpc.nfsd
-test -x $NFS_STATD || NFS_STATD=/usr/sbin/rpc.statd
-test -z $STATD_PID  STATD_PID=/var/run/rpc.statd.pid
 #
 # The user mode program must also exist (it just starts the kernel
 # threads using the kernel module code).
@@ -36,34 +34,9 @@ test -x $NFS_NFSD || exit 0
 # ridiculous 99
 test $NFS_SERVERS !=   test $NFS_SERVERS -gt 0  test $NFS_SERVERS 
-lt 100 || NFS_SERVERS=8
 #
-# The default state directory is /var/lib/nfs
-test -n $NFS_STATEDIR || NFS_STATEDIR=/var/lib/nfs
-#
 #--
 # Startup and shutdown functions.
 #  Actual startup/shutdown

[OE-core] [PATCH] nfs-utils: modify the boot sequence of the init script

2013-12-18 Thread Zhang Xiao 
Move the nfscommon out of rcS and let it start just before
nfsserver. Modify the useradd parameter with long parameter
to make it more readable.

Signed-off-by: Zhang Xiao xiao.zh...@windriver.com
---
 meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb
index 80074cb..45eacd9 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb
@@ -16,7 +16,8 @@ RRECOMMENDS_${PN} = kernel-module-nfsd
 inherit useradd
 
 USERADD_PACKAGES = ${PN}-client
-USERADD_PARAM_${PN}-client = -d /var/lib/nfs -r -s /bin/false rpcuser
+USERADD_PARAM_${PN}-client = --system  --home-dir /var/lib/nfs \
+ --shell /bin/false --user-group rpcuser
 
 SRC_URI = 
${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
@@ -41,7 +42,7 @@ INITSCRIPT_PACKAGES = ${PN} ${PN}-client
 INITSCRIPT_NAME = nfsserver
 INITSCRIPT_PARAMS = defaults
 INITSCRIPT_NAME_${PN}-client = nfscommon
-INITSCRIPT_PARAMS_${PN}-client = start 44 S .
+INITSCRIPT_PARAMS_${PN}-client = defaults 19 21
 
 inherit autotools update-rc.d systemd
 
-- 
1.8.1.2

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libidn: disable C# directly

2014-01-13 Thread Zhang Xiao 
Disable C# building with --disable-csharp instead of remove
useless binary files.

Signed-off-by: Zhang Xiao xiao.zh...@windriver.com
---
 meta/recipes-extended/libidn/libidn_1.28.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/libidn/libidn_1.28.bb 
b/meta/recipes-extended/libidn/libidn_1.28.bb
index 5daff43..effd5ea 100644
--- a/meta/recipes-extended/libidn/libidn_1.28.bb
+++ b/meta/recipes-extended/libidn/libidn_1.28.bb
@@ -27,7 +27,8 @@ SRC_URI[sha256sum] = 
dd357a968449abc97c7e5fa088a4a384de57cb36564f9d4e0d898ecc63
 PACKAGES =+ idn
 FILES_idn = ${bindir}/*
 
+EXTRA_OECONF = --disable-csharp
+
 do_install_append() {
-   rm -rf ${D}${libdir}/Libidn.dll
rm -rf ${D}${datadir}/emacs
 }
-- 
1.8.1.2

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] systemd: bug fix for the path of systemd.conf

2015-07-03 Thread Zhang Xiao 
tmpfiles.d/systemd.conf lies in {prefix}/lib not {libdir}.
Fix it.

Signed-off-by: Zhang Xiao xiao.zh...@windriver.com
---
 meta/recipes-core/systemd/systemd_219.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_219.bb 
b/meta/recipes-core/systemd/systemd_219.bb
index 6ed4fe0..04db47b 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -178,7 +178,7 @@ do_install() {
# this file is needed to exist if networkd is disabled but timesyncd is 
still in use since timesyncd checks it
# for existence else it fails
if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then
-   ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i 
-e \$ad /run/systemd/netif/links 0755 root root - 
${D}${libdir}/tmpfiles.d/systemd.conf', d)}
+   ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i 
-e \$ad /run/systemd/netif/links 0755 root root - 
${D}${prefix}/lib/tmpfiles.d/systemd.conf', d)}
fi
 }
 
-- 
1.8.5.2.233.g932f7e4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2] logrotate: move binary logrotate back to /usr/sbin

2015-07-13 Thread Zhang Xiao 
Binary logrotate should be installed in /usr/sbin, at the very
beginning, it was there. While with commit a46d3646a3e1781be44:
...
logrotate: obey our flags

Needed to quiet GNU_HASH warnings, and some minor fixes.
...

Part of its modification as below:
...
-oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
+oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} 
BINDIR=${bindir}
...
moves it to /usr/bin. It is not correct, so move it back to
/usr/sbin with ${sbindir}. 

Upstream-Status: pending

Signed-off-by: Zhang Xiao xiao.zh...@windriver.com
---
 meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb 
b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
index 7d0a159..6c2e222 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
@@ -53,7 +53,7 @@ do_compile_prepend() {
 }
 
 do_install(){
-oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} 
BINDIR=${bindir}
+oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} 
BINDIR=${sbindir}
 mkdir -p ${D}${sysconfdir}/logrotate.d
 mkdir -p ${D}${sysconfdir}/cron.daily
 mkdir -p ${D}${localstatedir}/lib
-- 
1.8.5.2.233.g932f7e4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] logrotate: move binary logrotate back to /usr/sbin

2015-07-13 Thread Zhang Xiao 
Upstream-Status: pending

Signed-off-by: Zhang Xiao xiao.zh...@windriver.com
---
 meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb 
b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
index 7d0a159..6c2e222 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
@@ -53,7 +53,7 @@ do_compile_prepend() {
 }
 
 do_install(){
-oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} 
BINDIR=${bindir}
+oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} 
BINDIR=${sbindir}
 mkdir -p ${D}${sysconfdir}/logrotate.d
 mkdir -p ${D}${sysconfdir}/cron.daily
 mkdir -p ${D}${localstatedir}/lib
-- 
1.8.5.2.233.g932f7e4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] diffutils-ptest: add runtime dependency on make

2018-07-05 Thread Zhang Xiao 
Signed-off-by: Zhang Xiao 
---
 meta/recipes-extended/diffutils/diffutils_3.6.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/diffutils/diffutils_3.6.bb 
b/meta/recipes-extended/diffutils/diffutils_3.6.bb
index deadd62c65..8ba897d18f 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.6.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.6.bb
@@ -19,6 +19,8 @@ acpaths = "-I ./m4"
 
 inherit ptest
 
+RDEPENDS_${PN}-ptest += "make"
+
 do_install_ptest() {
t=${D}${PTEST_PATH}
install -D ${S}/build-aux/test-driver $t/build-aux/test-driver
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 2/3] tiff: Fix multilib header conflict - tiffconf.h

2018-03-11 Thread Zhang Xiao 
Header file conflict between 32-bit and 64-bit versions.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-multimedia/libtiff/tiff_4.0.9.bb | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb 
b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
index 57bf7408d0..b8f895b143 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = 
"6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c00
 # exclude betas
 UPSTREAM_CHECK_REGEX = "tiff-(?P\d+(\.\d+)+).tar"
 
-inherit autotools
+inherit autotools multilib_header
 
 CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no"
 
@@ -45,4 +45,8 @@ PACKAGES =+ "tiffxx tiff-utils"
 FILES_tiffxx = "${libdir}/libtiffxx.so.*"
 FILES_tiff-utils = "${bindir}/*"
 
+do_install_append() {
+oe_multilib_header tiffconf.h
+}
+
 BBCLASSEXTEND = "native"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 3/3] libgpg-error: Fix multilib header conflict - pg-error.h and gpgrt.h

2018-03-11 Thread Zhang Xiao 
Header file conflict between 32-bit and 64-bit versions.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-support/libgpg-error/libgpg-error_1.27.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb 
b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
index b2e2d507c9..b74f079f5d 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = 
"4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a2
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-inherit autotools binconfig-disabled pkgconfig gettext
+inherit autotools binconfig-disabled pkgconfig gettext multilib_header
 CPPFLAGS += "-P"
 do_compile_prepend() {
TARGET_FILE=linux-gnu
@@ -53,6 +53,7 @@ do_compile_prepend() {
 do_install_append() {
# we don't have common lisp in OE
rm -rf "${D}${datadir}/common-lisp/"
+   oe_multilib_header gpg-error.h gpgrt.h
 }
 
 FILES_${PN}-dev += "${bindir}/gpg-error"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 1/3] valgrind: Fix multilib header conflict - valgrind/config.h

2018-03-11 Thread Zhang Xiao 
Header file conflict between 32-bit and 64-bit versions.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb 
b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
index 5bd315aff0..9390d30444 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
@@ -58,7 +58,7 @@ COMPATIBLE_HOST_linux-muslx32 = 'null'
 COMPATIBLE_HOST_mipsarchn32 = 'null'
 COMPATIBLE_HOST_mipsarchr6 = 'null'
 
-inherit autotools ptest
+inherit autotools ptest multilib_header
 
 EXTRA_OECONF = "--enable-tls --without-mpicc"
 EXTRA_OECONF += 
"${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != 
'32']}"
@@ -91,6 +91,7 @@ do_configure_prepend () {
 
 do_install_append () {
 install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/
+oe_multilib_header valgrind/config.h
 }
 
 TUNE = "${@strip_mcpu(d)}"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 6/7] xtrans: fix file conflict when multilib enabled

2018-03-12 Thread Zhang Xiao 
Script file xtrans.pc conflicts between 32 and 64 bit packages.
Use update-alternatives to add base_libdir as suffix to avoid it.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb 
b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
index d5b7f1a2c6..ef64f1fcfc 100644
--- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
@@ -16,7 +16,20 @@ PE = "1"
 
 RDEPENDS_${PN}-dev = ""
 
-inherit gettext
+inherit gettext  update-alternatives
+
+MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
+
+FILES_${PN}-dev += "${datadir}/pkgconfig/xtrans.pc-${MULTILIB_SUFFIX}"
+ALTERNATIVE_${PN}-dev = "xtrans.pc"
+ALTERNATIVE_LINK_NAME[xtrans.pc] = "${datadir}/pkgconfig/xtrans.pc"
+ALTERNATIVE_TARGET[xtrans.pc] = 
"${datadir}/pkgconfig/xtrans.pc-${MULTILIB_SUFFIX}"
+
+PACKAGE_PREPROCESS_FUNCS += "xtrans_alternative_rename"
+
+xtrans_alternative_rename() {
+mv ${PKGD}${datadir}/pkgconfig/xtrans.pc 
${PKGD}${datadir}/pkgconfig/xtrans.pc-${MULTILIB_SUFFIX}
+}
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 7/7] icu: fix file conflict when multilib enabled

2018-03-12 Thread Zhang Xiao 
Script icu-config conflicts between 32 and 64 bit packages.
Use update-alternatives to add base_libdir as suffix to avoid it.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-support/icu/icu.inc | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index 983118cd61..5dc4e1dbb9 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -19,7 +19,19 @@ BINCONFIG = "${bindir}/icu-config"
 
 ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}"
 
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig update-alternatives
+
+MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
+
+ALTERNATIVE_${PN}-dev = "icu-config"
+ALTERNATIVE_LINK_NAME[icu-config] = "${bindir}/icu-config"
+ALTERNATIVE_TARGET[icu-config] = "${bindir}/icu-config-${MULTILIB_SUFFIX}"
+
+PACKAGE_PREPROCESS_FUNCS += "alternatives_rename"
+
+alternatives_rename() {
+mv ${PKGD}/${bindir}/icu-config 
${PKGD}/${bindir}/icu-config-${MULTILIB_SUFFIX}
+}
 
 # ICU needs the native build directory as an argument to its 
--with-cross-build option when
 # cross-compiling. Taken the situation that different builds may share a 
common sstate-cache
@@ -76,7 +88,7 @@ do_install_append_class-target() {
 
 PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio"
 
-FILES_${PN}-dev += "${libdir}/${BPN}/"
+FILES_${PN}-dev += "${libdir}/${BPN}/ ${bindir}/icu-config-${MULTILIB_SUFFIX}"
 
 FILES_libicudata = "${libdir}/libicudata.so.*"
 FILES_libicuuc = "${libdir}/libicuuc.so.*"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 2/7] python3: fix file conflict when multilib enabled

2018-03-12 Thread Zhang Xiao 
Config file python3.5m-config conflicts between 32 and 64 bit packages.
Use update-alternatives to add base_libdir as suffix to avoid it.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-devtools/python/python3_3.5.4.bb | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/python/python3_3.5.4.bb 
b/meta/recipes-devtools/python/python3_3.5.4.bb
index a94d0096f1..7544e3318c 100644
--- a/meta/recipes-devtools/python/python3_3.5.4.bb
+++ b/meta/recipes-devtools/python/python3_3.5.4.bb
@@ -48,7 +48,13 @@ UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar"
 
 S = "${WORKDIR}/Python-${PV}"
 
-inherit autotools multilib_header python3native pkgconfig
+inherit autotools multilib_header python3native pkgconfig update-alternatives
+
+MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
+
+ALTERNATIVE_${PN}-core = "python3.5m-config"
+ALTERNATIVE_LINK_NAME[python3.5m-config] = "${bindir}/python3.5m-config"
+ALTERNATIVE_TARGET[python3.5m-config] = 
"${bindir}/python3.5m-config-${MULTILIB_SUFFIX}"
 
 CONFIGUREOPTS += " --with-system-ffi "
 
@@ -204,6 +210,8 @@ py_package_preprocess () {
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \
 -c "from py_compile import compile; 
compile('./${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py', optimize=2)"
cd -
+
+   mv ${PKGD}/${bindir}/python3.5m-config 
${PKGD}/${bindir}/python3.5m-config-${MULTILIB_SUFFIX}
 }
 
 # manual dependency additions
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 5/7] cairo: fix file conflict when multilib enabled

2018-03-12 Thread Zhang Xiao 
Script file cairo-trace conflict between 32 and 64 bit packages.
Use update-alternatives to add base_libdir as suffix to avoid it.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-graphics/cairo/cairo_1.14.12.bb | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/cairo/cairo_1.14.12.bb 
b/meta/recipes-graphics/cairo/cairo_1.14.12.bb
index 075ca1ed34..1f2d68c0de 100644
--- a/meta/recipes-graphics/cairo/cairo_1.14.12.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.14.12.bb
@@ -10,6 +10,20 @@ SRC_URI = 
"http://cairographics.org/releases/cairo-${PV}.tar.xz \
 SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165"
 SRC_URI[sha256sum] = 
"8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16"
 
+inherit update-alternatives
+
+MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
+
+ALTERNATIVE_${PN}-perf-utils="cairo-trace"
+ALTERNATIVE_LINK_NAME[cairo-trace] = "${bindir}/cairo-trace"
+ALTERNATIVE_TARGET[cairo-trace] = "${bindir}/cairo-trace-${MULTILIB_SUFFIX}"
+
+PACKAGE_PREPROCESS_FUNCS += "alternatives_rename"
+
+alternatives_rename() {
+   mv ${PKGD}${bindir}/cairo-trace 
${PKGD}${bindir}/cairo-trace-${MULTILIB_SUFFIX}
+}
+
 PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
 
 SUMMARY_${PN} = "The Cairo 2D vector graphics library"
@@ -35,7 +49,7 @@ FILES_${PN} = "${libdir}/libcairo.so.*"
 FILES_${PN}-dev += "${libdir}/cairo/*.so"
 FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*"
 FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"
-FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la 
${libdir}/cairo/libcairo-trace.so.*"
+FILES_${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la 
${libdir}/cairo/libcairo-trace.so.*"
 
 do_install_append () {
rm -rf ${D}${bindir}/cairo-sphinx
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 3/7] vala: fix file conflict when multilib enabled

2018-03-12 Thread Zhang Xiao 
Config file vala-gen-introspect-${SHRT_VER} conflicts between 32 and
64 bit packages. Use update-alternatives to add base_libdir as suffix
to avoid it.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-devtools/vala/vala.inc | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/vala/vala.inc 
b/meta/recipes-devtools/vala/vala.inc
index b22faad780..5c958cdbf0 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -19,7 +19,20 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
 SRC_URI = 
"http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz;
-inherit autotools pkgconfig upstream-version-is-even
+inherit autotools pkgconfig upstream-version-is-even update-alternatives
+
+MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
+ALTERNATIVE_${PN} = "vala-gen-introspect"
+ALTERNATIVE_LINK_NAME[vala-gen-introspect] = 
"${bindir}/vala-gen-introspect-${SHRT_VER}"
+ALTERNATIVE_TARGET[vala-gen-introspect] = 
"${bindir}/vala-gen-introspect-${SHRT_VER}-${MULTILIB_SUFFIX}"
+
+PACKAGE_PREPROCESS_FUNCS += "alternative_rename"
+
+alternative_rename() {
+mv ${PKGD}${bindir}/vala-gen-introspect-${SHRT_VER} \
+   ${PKGD}${bindir}/vala-gen-introspect-${SHRT_VER}-${MULTILIB_SUFFIX}
+}
+
 
 FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi 
${libdir}/${BPN}-${SHRT_VER}/"
 FILES_${PN}-doc += "${datadir}/devhelp"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 4/7] gobject-introspection: fix file conflict when multilib enabled

2018-03-12 Thread Zhang Xiao 
Script files conflict between 32 and 64 bit packages:
${bindir}/g-ir-annotation-tool
${bindir}/g-ir-compiler-wrapper
${bindir}/g-ir-scanner
${bindir}/g-ir-scanner-lddwrapper
${bindir}/g-ir-scanner-qemuwrapper
${bindir}/g-ir-scanner-wrapper
${datadir}/gir-1.0/GLib-2.0.gir

Use update-alternatives to add base_libdir as suffix to avoid it.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 .../gobject-introspection_1.54.1.bb| 34 +-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git 
a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
index 85c8001dea..d9d5825a78 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
@@ -19,9 +19,41 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/1.54/${BPN}-${PV}.tar.xz \
 SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41"
 SRC_URI[sha256sum] = 
"b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e"
 
-inherit autotools pkgconfig gtk-doc python3native qemu 
gobject-introspection-data upstream-version-is-even
+inherit autotools pkgconfig gtk-doc python3native qemu 
gobject-introspection-data upstream-version-is-even update-alternatives
 BBCLASSEXTEND = "native"
 
+MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
+ALTERNATIVE_${PN} = "annotation-tool compiler-wrapper scanner 
scanner-lddwrapper scanner-qemuwrapper scanner-wrapper"
+ALTERNATIVE_${PN}-dev = "GLib-2.0.gir"
+ALTERNATIVE_LINK_NAME[annotation-tool] = "${bindir}/g-ir-annotation-tool"
+ALTERNATIVE_TARGET[annotation-tool] = 
"${bindir}/g-ir-annotation-tool-${MULTILIB_SUFFIX}"
+ALTERNATIVE_LINK_NAME[compiler-wrapper] = "${bindir}/g-ir-compiler-wrapper"
+ALTERNATIVE_TARGET[compiler-wrapper] = 
"${bindir}/g-ir-compiler-wrapper-${MULTILIB_SUFFIX}"
+ALTERNATIVE_LINK_NAME[scanner] = "${bindir}/g-ir-scanner"
+ALTERNATIVE_TARGET[scanner] = "${bindir}/g-ir-scanner-${MULTILIB_SUFFIX}"
+ALTERNATIVE_LINK_NAME[scanner-lddwrapper] = "${bindir}/g-ir-scanner-lddwrapper"
+ALTERNATIVE_TARGET[scanner-lddwrapper] = 
"${bindir}/g-ir-scanner-lddwrapper-${MULTILIB_SUFFIX}"
+ALTERNATIVE_LINK_NAME[scanner-qemuwrapper] = 
"${bindir}/g-ir-scanner-qemuwrapper"
+ALTERNATIVE_TARGET[scanner-qemuwrapper] = 
"${bindir}/g-ir-scanner-qemuwrapper-${MULTILIB_SUFFIX}"
+ALTERNATIVE_LINK_NAME[scanner-wrapper] = "${bindir}/g-ir-scanner-wrapper"
+ALTERNATIVE_TARGET[scanner-wrapper] = 
"${bindir}/g-ir-scanner-wrapper-${MULTILIB_SUFFIX}"
+ALTERNATIVE_LINK_NAME[GLib-2.0.gir] = "${datadir}/gir-1.0/GLib-2.0.gir"
+ALTERNATIVE_TARGET[GLib-2.0.gir] = 
"${datadir}/gir-1.0/GLib-2.0.gir-${MULTILIB_SUFFIX}"
+
+FILES_${PN}-dev += "${datadir}/gir-1.0/GLib-2.0.gir-${MULTILIB_SUFFIX}"
+
+PACKAGE_PREPROCESS_FUNCS += "gobject_alternative_rename"
+
+gobject_alternative_rename() {
+mv ${PKGD}${bindir}/g-ir-annotation-tool 
${PKGD}${bindir}/g-ir-annotation-tool-${MULTILIB_SUFFIX}
+mv ${PKGD}${bindir}/g-ir-compiler-wrapper 
${PKGD}${bindir}/g-ir-compiler-wrapper-${MULTILIB_SUFFIX}
+mv ${PKGD}${bindir}/g-ir-scanner 
${PKGD}${bindir}/g-ir-scanner-${MULTILIB_SUFFIX}
+mv ${PKGD}${bindir}/g-ir-scanner-lddwrapper 
${PKGD}${bindir}/g-ir-scanner-lddwrapper-${MULTILIB_SUFFIX}
+mv ${PKGD}${bindir}/g-ir-scanner-qemuwrapper 
${PKGD}${bindir}/g-ir-scanner-qemuwrapper-${MULTILIB_SUFFIX}
+mv ${PKGD}${bindir}/g-ir-scanner-wrapper 
${PKGD}${bindir}/g-ir-scanner-wrapper-${MULTILIB_SUFFIX}
+mv ${PKGD}${datadir}/gir-1.0/GLib-2.0.gir 
${PKGD}${datadir}/gir-1.0/GLib-2.0.gir-${MULTILIB_SUFFIX}
+}
+
 # needed for writing out the qemu wrapper script
 export STAGING_DIR_HOST
 export B
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH 1/7] eudev: fix file conflict when multilib enabled

2018-03-12 Thread Zhang Xiao 
Config file udev.pc conflicts between 32 and 64 bit packages.
Use update-alternatives to add base_libdir as suffix to avoid it.

Signed-off-by: Zhang Xiao <xiao.zh...@windriver.com>
---
 meta/recipes-core/udev/eudev_3.2.5.bb | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/udev/eudev_3.2.5.bb 
b/meta/recipes-core/udev/eudev_3.2.5.bb
index 88ad8f1b37..d567c11272 100644
--- a/meta/recipes-core/udev/eudev_3.2.5.bb
+++ b/meta/recipes-core/udev/eudev_3.2.5.bb
@@ -23,7 +23,20 @@ SRC_URI = 
"http://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \
 SRC_URI[md5sum] = "6ca08c0e14380f87df8e8aceac123671"
 SRC_URI[sha256sum] = 
"49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af"
 
-inherit autotools update-rc.d qemu pkgconfig distro_features_check
+inherit autotools update-rc.d qemu pkgconfig distro_features_check 
update-alternatives
+
+MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
+
+ALTERNATIVE_${PN}-dev = "udev.pc"
+ALTERNATIVE_LINK_NAME[udev.pc] = "${datadir}/pkgconfig/udev.pc"
+ALTERNATIVE_TARGET[udev.pc] = "${datadir}/pkgconfig/udev.pc-${MULTILIB_SUFFIX}"
+
+PACKAGE_PREPROCESS_FUNCS += "eudev_alternative_rename"
+
+eudev_alternative_rename() {
+   # rename udev.pc
+   mv ${PKGD}${datadir}/pkgconfig/udev.pc 
${PKGD}${datadir}/pkgconfig/udev.pc-${MULTILIB_SUFFIX}
+}
 
 CONFLICT_DISTRO_FEATURES = "systemd"
 
@@ -65,7 +78,7 @@ PACKAGES =+ "eudev-hwdb"
 
 
 FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm"
-FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
+FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc-${MULTILIB_SUFFIX} \
${includedir}/libudev.h ${libdir}/libudev.so \
${includedir}/udev.h ${libdir}/libudev.la \
${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core