[PATCH 0/8] meta-openembedded: fix QA issues

[PATCH 0/8] meta-openembedded: fix QA issues

[Robert Yang]

The following changes since commit ea319464b673cbf9a416b582dc4766faeb998430:

  vlc: add PACKAGECONFIG for samba, upnp, dvdnav, sftp, vorbis, dc1394, dv1394, svg, svgdec (2015-11-16 21:50:11 +0100)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib rbt/8fixes
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=rbt/8fixes

Robert Yang (8):
  netmap-modules: fix for --no-drivers
  lldpad: fix installed-vs-shipped
  nbd: use BPN in Files
  dracut: fix host-user-contaminated
  cim-schema-exper: fix host-user-contaminated
  ctdb: RDEPENDS on bash
  ctdb: add PACKAGECONFIG for libtdb
  netkit-ftp: fixed invalid symlink

 .../recipes-devtools/dracut/dracut_git.bb          |    3 +++
 .../recipes-daemons/lldpad/lldpad_0.9.46.bb        |    2 +-
 .../recipes-kernel/netmap/netmap-modules_git.bb    |    2 +-
 .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb   |    2 +-
 .../cim-schema/cim-schema-exper_2.39.0.bb          |    1 +
 .../cim-schema/cim-schema-final_2.40.0.bb          |    1 +
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb |    4 ++++
 meta-networking/recipes-support/nbd/nbd_3.11.bb    |    6 +++---
 8 files changed, 15 insertions(+), 6 deletions(-)

-- 
1.7.9.5

[PATCH 1/8] netmap-modules: fix for --no-drivers

[Robert Yang]

Issue: LIN8-1697

The --no-drivers=virtio_net.c overrided --no-drivers=ixgbe, then errors:
git/LINUX/ixgbe_netmap_linux.h:52:2: error: #error "unsupported ixgbe driver version"
 #error "unsupported ixgbe driver version"
  ^

(LOCAL REV: NOT UPSTREAM) -- Jackie will will merge into his
netmap-modules work and send.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-kernel/netmap/netmap-modules_git.bb    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
index 6365fee..628c870 100644
--- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
+++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
@@ -15,7 +15,7 @@ EXTRA_OECONF = "--kernel-dir=${STAGING_KERNEL_BUILDDIR} \
                 --driver-suffix="-netmap" \
                 "
 
-EXTRA_OECONF += "--no-drivers=ixgbe --no-drivers=virtio_net.c"
+EXTRA_OECONF += "--no-drivers=ixgbe,virtio_net.c"
 
 LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,-O1', '')}"
 LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,--as-needed', '')}"
-- 
1.7.9.5

[PATCH 2/8] lldpad: fix installed-vs-shipped

[Robert Yang]

Issue: LIN8-1622

Fixed when multilib:
lldpad-0.9.46: lldpad: Files/directories were installed but not shipped in any package:
  /usr/lib
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
lldpad: 1 installed and not shipped files. [installed-vs-shipped]

This is because /usr/lib/systemd has been moved, but /usr/lib was left
in multilib, use "rmdir -p" to fix the problem.

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-daemons/lldpad/lldpad_0.9.46.bb        |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb b/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb
index b191df5..b66344f 100644
--- a/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb
+++ b/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb
@@ -23,7 +23,7 @@ do_configure_prepend() {
 do_install_append () {
     install -m 0755 -d ${D}${systemd_unitdir}
     mv ${D}${prefix}${systemd_unitdir}/* ${D}${systemd_unitdir}/
-    rmdir ${D}${prefix}${systemd_unitdir}
+    rmdir -p --ignore-fail-on-non-empty ${D}${prefix}${systemd_unitdir}
 }
 
 FILES_${PN} += "${systemd_unitdir}"
-- 
1.7.9.5

[PATCH 3/8] nbd: use BPN in Files

[Robert Yang]

Issue: LIN8-1626

Fixed when build with multilib:
lib32-nbd-3.11: lib32-nbd: Files/directories were installed but not shipped in any package:
  /usr/sbin/nbd-client
  /usr/bin/nbd-trdump
  /usr/bin/nbd-server
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
lib32-nbd: 3 installed and not shipped files. [installed-vs-shipped]

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta-networking/recipes-support/nbd/nbd_3.11.bb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-support/nbd/nbd_3.11.bb b/meta-networking/recipes-support/nbd/nbd_3.11.bb
index 70dc7e9..0f0ae8e 100644
--- a/meta-networking/recipes-support/nbd/nbd_3.11.bb
+++ b/meta-networking/recipes-support/nbd/nbd_3.11.bb
@@ -14,6 +14,6 @@ inherit autotools pkgconfig
 
 PACKAGES = "${PN}-client ${PN}-server ${PN}-dbg ${PN}-trdump ${PN}-doc"
 
-FILES_${PN}-client = "${sbindir}/${PN}-client"
-FILES_${PN}-server = "${bindir}/${PN}-server"
-FILES_${PN}-trdump = "${bindir}/${PN}-trdump"
+FILES_${PN}-client = "${sbindir}/${BPN}-client"
+FILES_${PN}-server = "${bindir}/${BPN}-server"
+FILES_${PN}-trdump = "${bindir}/${BPN}-trdump"
-- 
1.7.9.5

[PATCH 4/8] dracut: fix host-user-contaminated

[Robert Yang]

Issue: LIN8-1629

Fixed:
dracut-043+giteab03540cd695d940062af5b55c02e8829aaa526: dracut: /dracut/usr/lib/dracut/modules.d/99img-lib/img-lib.sh is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
lib32-dracut-043+giteab03540cd695d940062af5b55c02e8829aaa526: lib32-dracut: /lib32-dracut/usr/lib/dracut/modules.d/99img-lib/img-lib.sh is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Its Makefile uses cp -arx to install modules.d, so fix the owner
to root:root

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-devtools/dracut/dracut_git.bb          |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
index 91a8321..e026da7 100644
--- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
+++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
@@ -36,6 +36,9 @@ do_configure() {
 
 do_install() {
     oe_runmake install DESTDIR=${D}
+    # Its Makefile uses cp -arx to install modules.d, so fix the owner
+    # to root:root
+    chown -R root:root ${D}/${prefix}/lib/dracut/modules.d
 }
 
 PACKAGES =+ "${PN}-bash-completion"
-- 
1.7.9.5

[PATCH 5/8] cim-schema-exper: fix host-user-contaminated

[Robert Yang]

Issue: LIN8-1632

Fixed:
cim-schema-exper-2.39.0: cim-schema-exper: /cim-schema-exper/usr/share/mof/cimv2.39.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
cim-schema-final-2.40.0: cim-schema-final: /cim-schema-final/usr/share/mof/cimv2.40.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
lib32-cim-schema-exper-2.39.0: lib32-cim-schema-exper: /lib32-cim-schema-exper/usr/share/mof/cimv2.39.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
lib32-cim-schema-final-2.40.0: lib32-cim-schema-final: /lib32-cim-schema-final/usr/share/mof/cimv2.40.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

It uses cp -a to install the files, so fix the owner to root:root

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../cim-schema/cim-schema-exper_2.39.0.bb          |    1 +
 .../cim-schema/cim-schema-final_2.40.0.bb          |    1 +
 2 files changed, 2 insertions(+)

diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
index 62e50df..e4ed7b3 100644
--- a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
+++ b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
@@ -17,6 +17,7 @@ do_install() {
         install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV}
 
         cp -a ${S}/* ${D}${datadir}/mof/cimv${PV}/	
+        chown -R root:root ${D}${datadir}/mof/cimv${PV}
         for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do
                 sed -i -e 's/\r//g' $i
         done
diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
index 1694f31..7ab9c4d 100644
--- a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
+++ b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
@@ -22,6 +22,7 @@ do_install() {
         install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV}
 
         cp -a ${S}/* ${D}${datadir}/mof/cimv${PV}/	
+        chown -R root:root ${D}${datadir}/mof/cimv${PV}/
         for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do
                 sed -i -e 's/\r//g' $i
         done
-- 
1.7.9.5

[PATCH 6/8] ctdb: RDEPENDS on bash

[Robert Yang]

Issue: LIN8-1636

Fixed:
ctdb-2.5.1: /usr/bin/onnode_ctdb contained in package ctdb requires /bin/bash, but no providers found in its RDEPENDS [file-rdeps]

And really bashisms there:
$ checkbashisms usr/bin/onnode
possible bashism in tmp/work/corei7-64-wrs-linux/ctdb/2.5.1-r0/image/usr/bin/onnode line 186 (<<< here string):
        done <<<"$ctdb_status_output"
possible bashism in tmp/work/corei7-64-wrs-linux/ctdb/2.5.1-r0/image/usr/bin/onnode line 250 (<<< here string):
    done <<<"$out"
possible bashism in tmp/work/corei7-64-wrs-linux/ctdb/2.5.1-r0/image/usr/bin/onnode line 284 (${parm/?/pat[/str]}):
                echo "${all_nodes//#DEAD/}"
possible bashism in tmp/work/corei7-64-wrs-linux/ctdb/2.5.1-r0/image/usr/bin/onnode line 337 (${parm/?/pat[/str]}):

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
index 3731efd..70bdfb1 100644
--- a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
+++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
@@ -27,6 +27,7 @@ inherit autotools-brokensep pkgconfig systemd
 PARALLEL_MAKE = ""
 
 DEPENDS += "popt libtevent talloc"
+RDEPENDS_${PN} += "bash"
 
 do_configure() {
     oe_runconf
-- 
1.7.9.5

[PATCH 7/8] ctdb: add PACKAGECONFIG for libtdb

[Robert Yang]

Issue: LIN8-1713

Fixed:
WARNING: QA Issue: ctdb rdepends on libtdb, but it isn't a build dependency? [build-deps]

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
index 70bdfb1..c19916c 100644
--- a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
+++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
@@ -24,6 +24,9 @@ SRC_URI[sha256sum] = "d5bf3f674cae986bb6178b1db215a703ac94adc5f75fadfdcff63dcbb5
 
 inherit autotools-brokensep pkgconfig systemd
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb"
+
 PARALLEL_MAKE = ""
 
 DEPENDS += "popt libtevent talloc"
-- 
1.7.9.5

[PATCH 8/8] netkit-ftp: fixed invalid symlink

[Robert Yang]

Issue: LIN8-1635

netkit-ftp-0.17: Symlink /usr/bin/pftp in netkit-ftp points to TMPDIR [symlink-to-sysroot]
lib32-netkit-ftp-0.17: Symlink /usr/bin/pftp in lib32-netkit-ftp points to TMPDIR [symlink-to-sysroot]

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
index 2f227a6..37f5bc7 100644
--- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
+++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
@@ -31,7 +31,7 @@ do_install () {
     install -d ${D}${mandir}/man5
 
     install -m${BINMODE} ${S}/ftp/ftp ${D}${bindir}
-    ln -sf ${D}${bindir}/ftp ${D}${bindir}/pftp
+    ln -sf ftp ${D}${bindir}/pftp
     install -m${MANMODE} ${S}/ftp/ftp.1 ${D}${mandir}/man1
     ln -sf ftp.1 ${D}${mandir}/man1/pftp.1
     install -m${MANMODE} ${S}/ftp/netrc.5 ${D}${mandir}/man5
-- 
1.7.9.5

Re: [PATCH 0/8] meta-openembedded: fix QA issues

[Robert Yang]

Sorry, please ignore this thread, some commit message should not
be there, I will send a V2.

// Robert

On 11/20/2015 05:32 PM, Robert Yang wrote:
> The following changes since commit ea319464b673cbf9a416b582dc4766faeb998430:
>
>    vlc: add PACKAGECONFIG for samba, upnp, dvdnav, sftp, vorbis, dc1394, dv1394, svg, svgdec (2015-11-16 21:50:11 +0100)
>
> are available in the git repository at:
>
>    git://git.openembedded.org/meta-openembedded-contrib rbt/8fixes
>    http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=rbt/8fixes
>
> Robert Yang (8):
>    netmap-modules: fix for --no-drivers
>    lldpad: fix installed-vs-shipped
>    nbd: use BPN in Files
>    dracut: fix host-user-contaminated
>    cim-schema-exper: fix host-user-contaminated
>    ctdb: RDEPENDS on bash
>    ctdb: add PACKAGECONFIG for libtdb
>    netkit-ftp: fixed invalid symlink
>
>   .../recipes-devtools/dracut/dracut_git.bb          |    3 +++
>   .../recipes-daemons/lldpad/lldpad_0.9.46.bb        |    2 +-
>   .../recipes-kernel/netmap/netmap-modules_git.bb    |    2 +-
>   .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb   |    2 +-
>   .../cim-schema/cim-schema-exper_2.39.0.bb          |    1 +
>   .../cim-schema/cim-schema-final_2.40.0.bb          |    1 +
>   meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb |    4 ++++
>   meta-networking/recipes-support/nbd/nbd_3.11.bb    |    6 +++---
>   8 files changed, 15 insertions(+), 6 deletions(-)
>

Re: [PATCH 1/8] netmap-modules: fix for --no-drivers

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1680 bytes --]

On Fri, Nov 20, 2015 at 01:32:40AM -0800, Robert Yang wrote:
> Issue: LIN8-1697
> 
> The --no-drivers=virtio_net.c overrided --no-drivers=ixgbe, then errors:
> git/LINUX/ixgbe_netmap_linux.h:52:2: error: #error "unsupported ixgbe driver version"
>  #error "unsupported ixgbe driver version"
>   ^

There is better fix for this on ML already.

> 
> (LOCAL REV: NOT UPSTREAM) -- Jackie will will merge into his
> netmap-modules work and send.

Next time don't include this.

> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  .../recipes-kernel/netmap/netmap-modules_git.bb    |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
> index 6365fee..628c870 100644
> --- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
> +++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
> @@ -15,7 +15,7 @@ EXTRA_OECONF = "--kernel-dir=${STAGING_KERNEL_BUILDDIR} \
>                  --driver-suffix="-netmap" \
>                  "
>  
> -EXTRA_OECONF += "--no-drivers=ixgbe --no-drivers=virtio_net.c"
> +EXTRA_OECONF += "--no-drivers=ixgbe,virtio_net.c"
>  
>  LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,-O1', '')}"
>  LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,--as-needed', '')}"
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 5/8] cim-schema-exper: fix host-user-contaminated

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3326 bytes --]

On Fri, Nov 20, 2015 at 01:32:44AM -0800, Robert Yang wrote:
> Issue: LIN8-1632
> 
> Fixed:
> cim-schema-exper-2.39.0: cim-schema-exper: /cim-schema-exper/usr/share/mof/cimv2.39.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
> cim-schema-final-2.40.0: cim-schema-final: /cim-schema-final/usr/share/mof/cimv2.40.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
> lib32-cim-schema-exper-2.39.0: lib32-cim-schema-exper: /lib32-cim-schema-exper/usr/share/mof/cimv2.39.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
> lib32-cim-schema-final-2.40.0: lib32-cim-schema-final: /lib32-cim-schema-final/usr/share/mof/cimv2.40.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
> 
> It uses cp -a to install the files, so fix the owner to root:root
> 
> (LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  .../cim-schema/cim-schema-exper_2.39.0.bb          |    1 +
>  .../cim-schema/cim-schema-final_2.40.0.bb          |    1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
> index 62e50df..e4ed7b3 100644
> --- a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
> +++ b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
> @@ -17,6 +17,7 @@ do_install() {
>          install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV}
>  
>          cp -a ${S}/* ${D}${datadir}/mof/cimv${PV}/	
> +        chown -R root:root ${D}${datadir}/mof/cimv${PV}

Why don't you fix it to use install instead of cp -a + chown?

>          for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do
>                  sed -i -e 's/\r//g' $i
>          done
> diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
> index 1694f31..7ab9c4d 100644
> --- a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
> +++ b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
> @@ -22,6 +22,7 @@ do_install() {
>          install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV}
>  
>          cp -a ${S}/* ${D}${datadir}/mof/cimv${PV}/	
> +        chown -R root:root ${D}${datadir}/mof/cimv${PV}/
>          for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do
>                  sed -i -e 's/\r//g' $i
>          done
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 5/8] cim-schema-exper: fix host-user-contaminated

[Robert Yang]

On 11/20/2015 05:42 PM, Martin Jansa wrote:
> On Fri, Nov 20, 2015 at 01:32:44AM -0800, Robert Yang wrote:
>> Issue: LIN8-1632
>>
>> Fixed:
>> cim-schema-exper-2.39.0: cim-schema-exper: /cim-schema-exper/usr/share/mof/cimv2.39.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
>> cim-schema-final-2.40.0: cim-schema-final: /cim-schema-final/usr/share/mof/cimv2.40.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
>> lib32-cim-schema-exper-2.39.0: lib32-cim-schema-exper: /lib32-cim-schema-exper/usr/share/mof/cimv2.39.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
>> lib32-cim-schema-final-2.40.0: lib32-cim-schema-final: /lib32-cim-schema-final/usr/share/mof/cimv2.40.0/Network/CIM_IPAddressRange.mof is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
>>
>> It uses cp -a to install the files, so fix the owner to root:root
>>
>> (LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   .../cim-schema/cim-schema-exper_2.39.0.bb          |    1 +
>>   .../cim-schema/cim-schema-final_2.40.0.bb          |    1 +
>>   2 files changed, 2 insertions(+)
>>
>> diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
>> index 62e50df..e4ed7b3 100644
>> --- a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
>> +++ b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
>> @@ -17,6 +17,7 @@ do_install() {
>>           install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV}
>>
>>           cp -a ${S}/* ${D}${datadir}/mof/cimv${PV}/	
>> +        chown -R root:root ${D}${datadir}/mof/cimv${PV}
>
> Why don't you fix it to use install instead of cp -a + chown?

Because there are a lot of files and directories:

$ find cim-schema-exper/image/usr/share/mof/cimv2.39.0/ -type f |wc -l
1816

$ find cim-schema-exper/image/usr/share/mof/cimv2.39.0/ -type d |wc -l
15

I think that's why it used cp -a before. And we did use chown to fix such
issues for several recipes in oe-core and meta-openembedded.

// Robert

>
>>           for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do
>>                   sed -i -e 's/\r//g' $i
>>           done
>> diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
>> index 1694f31..7ab9c4d 100644
>> --- a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
>> +++ b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
>> @@ -22,6 +22,7 @@ do_install() {
>>           install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV}
>>
>>           cp -a ${S}/* ${D}${datadir}/mof/cimv${PV}/	
>> +        chown -R root:root ${D}${datadir}/mof/cimv${PV}/
>>           for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do
>>                   sed -i -e 's/\r//g' $i
>>           done
>> --
>> 1.7.9.5
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>

Re: [PATCH 1/8] netmap-modules: fix for --no-drivers

[Robert Yang]

On 11/20/2015 05:41 PM, Martin Jansa wrote:
> On Fri, Nov 20, 2015 at 01:32:40AM -0800, Robert Yang wrote:
>> Issue: LIN8-1697
>>
>> The --no-drivers=virtio_net.c overrided --no-drivers=ixgbe, then errors:
>> git/LINUX/ixgbe_netmap_linux.h:52:2: error: #error "unsupported ixgbe driver version"
>>   #error "unsupported ixgbe driver version"
>>    ^
>
> There is better fix for this on ML already.

I had sent a V2, and this had been drop in V2.

// Robert

>
>>
>> (LOCAL REV: NOT UPSTREAM) -- Jackie will will merge into his
>> netmap-modules work and send.
>
> Next time don't include this.
>
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   .../recipes-kernel/netmap/netmap-modules_git.bb    |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
>> index 6365fee..628c870 100644
>> --- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
>> +++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
>> @@ -15,7 +15,7 @@ EXTRA_OECONF = "--kernel-dir=${STAGING_KERNEL_BUILDDIR} \
>>                   --driver-suffix="-netmap" \
>>                   "
>>
>> -EXTRA_OECONF += "--no-drivers=ixgbe --no-drivers=virtio_net.c"
>> +EXTRA_OECONF += "--no-drivers=ixgbe,virtio_net.c"
>>
>>   LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,-O1', '')}"
>>   LDFLAGS := "${@'${LDFLAGS}'.replace('-Wl,--as-needed', '')}"
>> --
>> 1.7.9.5
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>

Re: [PATCH 2/8] lldpad: fix installed-vs-shipped

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1999 bytes --]

On Fri, Nov 20, 2015 at 01:32:41AM -0800, Robert Yang wrote:
> Issue: LIN8-1622
> 
> Fixed when multilib:
> lldpad-0.9.46: lldpad: Files/directories were installed but not shipped in any package:
>   /usr/lib
> Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
> lldpad: 1 installed and not shipped files. [installed-vs-shipped]
> 
> This is because /usr/lib/systemd has been moved, but /usr/lib was left
> in multilib, use "rmdir -p" to fix the problem.
> 
> (LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151120

doesn't apply because it was removed a while back:

commit 1a57f561caea01e6a19313af019138c783e9f964
Author: Joe MacDonald <joe_macdonald@mentor.com>
Date:   Thu Oct 22 09:46:48 2015 -0400

    lldpad: remove obsolete recipe

> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  .../recipes-daemons/lldpad/lldpad_0.9.46.bb        |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb b/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb
> index b191df5..b66344f 100644
> --- a/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb
> +++ b/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb
> @@ -23,7 +23,7 @@ do_configure_prepend() {
>  do_install_append () {
>      install -m 0755 -d ${D}${systemd_unitdir}
>      mv ${D}${prefix}${systemd_unitdir}/* ${D}${systemd_unitdir}/
> -    rmdir ${D}${prefix}${systemd_unitdir}
> +    rmdir -p --ignore-fail-on-non-empty ${D}${prefix}${systemd_unitdir}
>  }
>  
>  FILES_${PN} += "${systemd_unitdir}"
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]