Skip to contentSkip to conversation

meta-openembedded: fix QA issues

PATCH In review Robert Yang 2 participants 9 messages Nov 20, 2015 – Dec 11, 2015

lore
Share & tools
lore
#0 lore raw

v2 cover meta-openembedded: fix QA issues

* V2:
Fix commit messages.

// Robert

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/7fixes
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=rbt/7fixes

Robert Yang (7):
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-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 +++---
 7 files changed, 14 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/7 lldpad: fix installed-vs-shipped

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.

---
 .../recipes-daemons/lldpad/lldpad_0.9.46.bb        |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb +1 -1
index b191df5..b66344f 100644
@@ -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}"
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v2 2/7 nbd: use BPN in Files

In reply to Robert Yang

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]

---
 meta-networking/recipes-support/nbd/nbd_3.11.bb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-networking/recipes-support/nbd/nbd_3.11.bb +3 -3
index 70dc7e9..0f0ae8e 100644
@@ -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"
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH v2 3/7 dracut: fix host-user-contaminated

In reply to Robert Yang

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

---
 .../recipes-devtools/dracut/dracut_git.bb          |    3 +++
 1 file changed, 3 insertions(+)
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +3 -0
index 91a8321..e026da7 100644
@@ -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"
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH v2 4/7 cim-schema-exper: fix host-user-contaminated

In reply to Robert Yang

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

---
 .../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(+)
meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb +1 -0
index 62e50df..e4ed7b3 100644
@@ -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
meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb +1 -0
index 1694f31..7ab9c4d 100644
@@ -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
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH v2 5/7 ctdb: RDEPENDS on bash

In reply to Robert Yang

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]}):
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb |    1 +
 1 file changed, 1 insertion(+)
meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb +1 -0
index 3731efd..70bdfb1 100644
@@ -27,6 +27,7 @@ inherit autotools-brokensep pkgconfig systemd
 PARALLEL_MAKE = ""
 
 DEPENDS += "popt libtevent talloc"
+RDEPENDS_${PN} += "bash"
 
 do_configure() {
     oe_runconf
Signature · 1 line
1.7.9.5
#6 lore raw

Re: [PATCH 5/7] ctdb: RDEPENDS on bash

Quoted 2 lines · Robert Yang

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]

There is patch for this from kergoth already.

Quoted 36 lines

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]}):
---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb |    1 +
 1 file changed, 1 insertion(+)
meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb +1 -0
index 3731efd..70bdfb1 100644
@@ -27,6 +27,7 @@ inherit autotools-brokensep pkgconfig systemd
 PARALLEL_MAKE = ""
 
 DEPENDS += "popt libtevent talloc"
+RDEPENDS_${PN} += "bash"
 
 do_configure() {
     oe_runconf
Signature · 7 lines
1.7.9.5

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#7 lore raw

PATCH v2 6/7 ctdb: add PACKAGECONFIG for libtdb

In reply to Robert Yang

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

---
 meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb |    3 +++
 1 file changed, 3 insertions(+)
meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb +3 -0
index 70bdfb1..c19916c 100644
@@ -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"
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH v2 7/7 netkit-ftp: fixed invalid symlink

In reply to Robert Yang

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]

---
 .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +1 -1
index 2f227a6..37f5bc7 100644
@@ -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
Signature · 1 line
1.7.9.5