[meta-oe][PATCH 0/8] fix QA issue for multilib

[meta-oe][PATCH 0/8] fix QA issue for multilib

[Yi Zhao]

The following changes since commit 55713b8c15cec00c01b4924ee60f13753c7d5354:

  inetutils: 1.9.2 -> 1.9.4 (2015-08-19 20:43:30 -0400)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib yzhao/fix-qa-issue
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=yzhao/fix-qa-issue

Yi Zhao (8):
  tomoyo-tools: pass correct libdir to make
  libssh: upgrade 0.6.4 -> 0.7.1
  wbxml2: set correct LIB_SUFFIX for multilib
  libftdi: set correct LIB_SUFFIX for multilib
  openwsman: pass correct libdir to cmake
  qt-creator: pass correct IDE_LIBRARY_BASENAME
  libqofono: fix the hardcoded libdir
  libconnman-qt: fix the hardcoded libdir

 .../recipes-extended/openwsman/openwsman_2.6.0.bb  |    2 +-
 meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc |    1 +
 meta-oe/recipes-qt/libqofono/libqofono_0.4.bb      |    1 +
 meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb  |    2 ++
 meta-oe/recipes-support/libftdi/libftdi_1.1.bb     |    2 ++
 .../libssh/{libssh_git.bb => libssh_0.7.1.bb}      |    7 +++----
 meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb  |    2 ++
 .../tomoyo-tools/tomoyo-tools_2.5.0.bb             |    3 ++-
 8 files changed, 14 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-support/libssh/{libssh_git.bb => libssh_0.7.1.bb} (79%)

-- 
1.7.9.5

[meta-oe][PATCH 1/8] tomoyo-tools: pass correct libdir to make

[Yi Zhao]

Fix QA issue when enable multilib:
ERROR: QA Issue: tomoyo-tools: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libtomoyotools.so.3.0.2
  /usr/lib/libtomoyotools.so.3
  /usr/lib/.debug
  /usr/lib/tomoyo
  /usr/lib/.debug/libtomoyotools.so.3.0.2
  /usr/lib/tomoyo/init_policy
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.  [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../tomoyo-tools/tomoyo-tools_2.5.0.bb             |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb
index adb538b..ac8593c 100644
--- a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb
+++ b/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb
@@ -18,7 +18,8 @@ FILES_${PN}     += "${libdir}/tomoyo"
 FILES_${PN}-dbg += "${libdir}/tomoyo/.debug"
 
 DEPENDS = "linux-libc-headers ncurses"
-CFLAGS_append += "-D_GNU_SOURCE"
+
+EXTRA_OEMAKE = "-e USRLIBDIR=${libdir}"
 
 do_compile () {
 	oe_runmake 'CC=${CC}'
-- 
1.7.9.5

[meta-oe][PATCH 2/8] libssh: upgrade 0.6.4 -> 0.7.1

[Yi Zhao]

Set the correct LIB_SUFFIX to fix QA issue for multilib:
ERROR: QA Issue: libssh: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libssh.so
  /usr/lib/libssh_threads.so.4.5.0
  /usr/lib/libssh.so.4
  /usr/lib/libssh_threads.so.4
  /usr/lib/libssh_threads.so
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.  [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../libssh/{libssh_git.bb => libssh_0.7.1.bb}      |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/libssh/{libssh_git.bb => libssh_0.7.1.bb} (79%)

diff --git a/meta-oe/recipes-support/libssh/libssh_git.bb b/meta-oe/recipes-support/libssh/libssh_0.7.1.bb
similarity index 79%
rename from meta-oe/recipes-support/libssh/libssh_git.bb
rename to meta-oe/recipes-support/libssh/libssh_0.7.1.bb
index 47fb39a..371e1ab 100644
--- a/meta-oe/recipes-support/libssh/libssh_git.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.7.1.bb
@@ -7,17 +7,16 @@ DEPENDS = "zlib openssl libgcrypt"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139"
 
-SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-6"
-SRCREV = "3880a8ed80a4b1e2c052bd62f328bba2f869d5ae"
+SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-7"
+SRCREV = "053f72c671a83b32238dc01b56a66752fb15b7ec"
 S = "${WORKDIR}/git"
 
-PV = "0.6.4+git${SRCPV}"
-
 EXTRA_OECMAKE = " \
     -DWITH_GCRYPT=1 \
     -DWITH_PCAP=1 \
     -DWITH_SFTP=1 \
     -DWITH_ZLIB=1 \
+    -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')} \
     "
 
 PACKAGECONFIG ??=""
-- 
1.7.9.5

[meta-oe][PATCH 3/8] wbxml2: set correct LIB_SUFFIX for multilib

[Yi Zhao]

Fix QA issue when enable multilib:
ERROR: QA Issue: wbxml2: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libwbxml2.so.0.0.17
  /usr/lib/libwbxml2.so
  /usr/lib/libwbxml2.so.0
  /usr/lib/.debug
  /usr/lib/pkgconfig
  /usr/lib/.debug/libwbxml2.so.0.0.17
  /usr/lib/pkgconfig/libwbxml2.pc
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
index d383c65..bd15bba 100644
--- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
+++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
@@ -15,6 +15,8 @@ S = "${WORKDIR}/libwbxml-${PV}"
 
 inherit cmake pkgconfig
 
+EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}"
+
 PACKAGES += "${PN}-tools"
 
 FILES_${PN}-tools = "${bindir}"
-- 
1.7.9.5

[meta-oe][PATCH 4/8] libftdi: set correct LIB_SUFFIX for multilib

[Yi Zhao]

Fix QA issue when enable multilib:
ERROR: QA Issue: libftdi: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libftdipp1.so
  /usr/lib/libftdi1.so
  /usr/lib/libftdipp1.so.2.1.0
  /usr/lib/libftdi1.so.2
  /usr/lib/libftdipp1.a
  /usr/lib/libftdipp1.so.2
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/libftdi/libftdi_1.1.bb |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.1.bb b/meta-oe/recipes-support/libftdi/libftdi_1.1.bb
index d8b189b..44e040c 100644
--- a/meta-oe/recipes-support/libftdi/libftdi_1.1.bb
+++ b/meta-oe/recipes-support/libftdi/libftdi_1.1.bb
@@ -24,6 +24,8 @@ PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on,-DFTDI_BUILD_CPP=off,boost"
 
 inherit cmake binconfig pkgconfig
 
+EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}"
+
 FILES_${PN}-dev += "${libdir}/cmake"
 
 BBCLASSEXTEND = "native"
-- 
1.7.9.5

[meta-oe][PATCH 5/8] openwsman: pass correct libdir to cmake

[Yi Zhao]

Fix QA issue when enable multilib:
ERROR: QA Issue: openwsman: Files/directories were installed but not
shipped in any package:
  /usr/lib
  /usr/lib/libwsman_clientpp.so
  /usr/lib/libwsman_client.so
  /usr/lib/libwsman.so.1.0.0
  /usr/lib/libwsman.so
  /usr/lib/libwsman_client.so.4
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../recipes-extended/openwsman/openwsman_2.6.0.bb  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.0.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.0.bb
index 67cd618..5a19264 100644
--- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.0.bb
+++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.0.bb
@@ -33,7 +33,7 @@ EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \
                  -DBUILD_LIBCIM=NO \
                  -DBUILD_PERL=YES \
                  -DCMAKE_INSTALL_PREFIX=${prefix} \
-                 -DLIB=lib \
+                 -DLIB=${baselib} \
                 "
 
 do_configure_prepend() {
-- 
1.7.9.5

[meta-oe][PATCH 6/8] qt-creator: pass correct IDE_LIBRARY_BASENAME

[Yi Zhao]

Fix QA issue when enable multilib:
ERROR: QA Issue: qt-creator: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/qtcreator
  /usr/lib/qtcreator/libQmlJS.so.1
  /usr/lib/qtcreator/libQmlEditorWidgets.so
  /usr/lib/qtcreator/libUtils.so.1
  /usr/lib/qtcreator/libCPlusPlus.so
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb
index ca73cda..d911db1 100644
--- a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb
+++ b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb
@@ -16,6 +16,8 @@ S = "${WORKDIR}/${BP}-src"
 
 inherit qt4x11
 
+EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}"
+
 do_install() {
 	oe_runmake INSTALL_ROOT=${D}${prefix} install
 	oe_runmake INSTALL_ROOT=${D}${prefix} install_docs
-- 
1.7.9.5

[meta-oe][PATCH 7/8] libqofono: fix the hardcoded libdir

[Yi Zhao]

Fix QA issue when enable multilib:
ERROR: QA Issue: libqofono: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libqofono.so.0.1.0
  /usr/lib/libqofono.so.0
  /usr/lib/libqofono.so.0.1
  /usr/lib/libqofono.so
  /usr/lib/libqofono.prl
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-qt/libqofono/libqofono_0.4.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-qt/libqofono/libqofono_0.4.bb b/meta-oe/recipes-qt/libqofono/libqofono_0.4.bb
index d526044..9349372 100644
--- a/meta-oe/recipes-qt/libqofono/libqofono_0.4.bb
+++ b/meta-oe/recipes-qt/libqofono/libqofono_0.4.bb
@@ -66,6 +66,7 @@ do_configure_prepend() {
     # Hack *.pro variables
     find . -iname '*.pro' -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
     find . -iname '*.pro' -exec sed -i -e 's,$$\[QT_INSTALL_PREFIX\],$$INSTALL_ROOT$$PREFIX,g' '{}' ';'
+    find . -iname '*.pro' -exec sed -i -e 's,$$INSTALL_ROOT$$PREFIX/lib,$$INSTALL_ROOT$$PREFIX/${baselib},g' '{}' ';'
 }
 
 do_install() {
-- 
1.7.9.5

[meta-oe][PATCH 8/8] libconnman-qt: fix the hardcoded libdir

[Yi Zhao]

Fix QA issue when enable multilib:
ERROR: QA Issue: libconnman-qte: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libconnman-qtopia.prl
  /usr/lib/libconnman-qtopia.so.1.0
  /usr/lib/libconnman-qtopia.so.1.0.50
  /usr/lib/libconnman-qtopia.so
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
index 3f91be2..859c854 100644
--- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
@@ -17,6 +17,7 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=notests TARGET_SUFFIX=${QT_DIR_NAME}"
 do_configure_prepend() {
     # Hack *.pro variables
     find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
+    find ${S} -iname '*.pro' -exec sed -i -e 's,$$INSTALL_ROOT$$PREFIX/lib,$$INSTALL_ROOT$$PREFIX/${baselib},g' '{}' ';'
 }
 do_install() {
     oe_runmake install INSTALL_ROOT=${D}
-- 
1.7.9.5

Re: [meta-oe][PATCH 1/8] tomoyo-tools: pass correct libdir to make

[Khem Raj]

On Thu, Aug 20, 2015 at 11:46 PM, Yi Zhao <yi.zhao@windriver.com> wrote:
> -CFLAGS_append += "-D_GNU_SOURCE"
> +

why was CFLAGS append removed ?

> +EXTRA_OEMAKE = "-e USRLIBDIR=${libdir}"

Re: [meta-oe][PATCH 1/8] tomoyo-tools: pass correct libdir to make

[Yi Zhao]

在 2015年08月21日 15:27, Khem Raj 写道:
> On Thu, Aug 20, 2015 at 11:46 PM, Yi Zhao <yi.zhao@windriver.com> wrote:
>> -CFLAGS_append += "-D_GNU_SOURCE"
>> +
> why was CFLAGS append removed ?

There is a redefined warning when compile like below:

In file included from tomoyo-diffpolicy.c:23:0:
tomoyotools.h:26:0: warning: "_GNU_SOURCE" redefined
  #define _GNU_SOURCE
  ^
In file included from tomoyo-checkpolicy.c:23:0:
tomoyotools.h:26:0: warning: "_GNU_SOURCE" redefined
  #define _GNU_SOURCE
  ^
<command-line>:0:0: note: this is the location of the previous definition
<command-line>:0:0: note: this is the location of the previous definition
In file included from tomoyo-auditd.c:23:0:
tomoyotools.h:26:0: warning: "_GNU_SOURCE" redefined
  #define _GNU_SOURCE
  ^
<command-line>:0:0: note: this is the location of the previous definition

The _GNU_SOURCE is ready defined in the source and there is not ifdef or 
ifndef for it in the source.

Yi

>
>> +EXTRA_OEMAKE = "-e USRLIBDIR=${libdir}"

Re: [meta-oe][PATCH 1/8] tomoyo-tools: pass correct libdir to make

[Khem Raj]

On Fri, Aug 21, 2015 at 2:15 AM, Yi Zhao <yi.zhao@windriver.com> wrote:
>> why was CFLAGS append removed ?
>
>
> There is a redefined warning when compile like below:
>
> In file included from tomoyo-diffpolicy.c:23:0:
> tomoyotools.h:26:0: warning: "_GNU_SOURCE" redefined
>  #define _GNU_SOURCE
>  ^
> In file included from tomoyo-checkpolicy.c:23:0:
> tomoyotools.h:26:0: warning: "_GNU_SOURCE" redefined
>  #define _GNU_SOURCE
>  ^
> <command-line>:0:0: note: this is the location of the previous definition
> <command-line>:0:0: note: this is the location of the previous definition
> In file included from tomoyo-auditd.c:23:0:
> tomoyotools.h:26:0: warning: "_GNU_SOURCE" redefined
>  #define _GNU_SOURCE
>  ^
> <command-line>:0:0: note: this is the location of the previous definition
>
> The _GNU_SOURCE is ready defined in the source and there is not ifdef or
> ifndef for it in the source.

ok. Althogh the difference is that now it will be passed to files that
includes this header only. That may be the right thing