Skip to contentSkip to conversation

Fixes for multilib

PATCH New Robert Yang 1 participant 3 messages Jun 10, 2015

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

cover Fixes for multilib

The following changes since commit de6a26b95a7f7bd8f9dc47ab35d8b07ba671f4eb:

x264: use x86 over-ride instead of i586 (2015-06-08 17:32:46 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/multilib
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/multilib

Robert Yang (2):
update-rc.d.bbclass: add MLPREFIX when set RRECOMMENDS multilib.bbclass: use package_qa_handle_error

 meta/classes/insane.bbclass      |    2 +-
 meta/classes/multilib.bbclass    |    5 +++--
 meta/classes/update-rc.d.bbclass |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 update-rc.d.bbclass: add MLPREFIX when set RRECOMMENDS

Fixed when build with multilib:
WARNING: Multilib QA Issue: lib32-alsa-state package lib32-alsa-state - suspicious values 'update-rc.d' in RRECOMMENDS
WARNING: Multilib QA Issue: lib32-modutils-initscripts package lib32-modutils-initscripts - suspicious values 'update-rc.d' in RRECOMMENDS
WARNING: Multilib QA Issue: lib32-init-ifupdown package lib32-init-ifupdown - suspicious values 'update-rc.d' in RRECOMMENDS
WARNING: Multilib QA Issue: lib32-xserver-nodm-init package lib32-xserver-nodm-init - suspicious values 'update-rc.d' in RRECOMMENDS
WARNING: Multilib QA Issue: lib32-sysklogd package lib32-sysklogd - suspicious values 'update-rc.d' in RRECOMMENDS

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/update-rc.d.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/update-rc.d.bbclass +1 -1
index c385635..4d62c2f 100644
@@ -118,7 +118,7 @@ python populate_packages_updatercd () {
         postrm += localdata.getVar('updatercd_postrm', True)
         d.setVar('pkg_postrm_%s' % pkg, postrm)
 
-        d.appendVar('RRECOMMENDS_' + pkg, " ${UPDATERCD}")
+        d.appendVar('RRECOMMENDS_' + pkg, " ${MLPREFIX}${UPDATERCD}")
 
     # Check that this class isn't being inhibited (generally, by
     # systemd.bbclass) before doing any work.
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/2 multilib.bbclass: use package_qa_handle_error

In reply to Robert Yang

Use package_qa_handle_error to handle the QA issue.

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/insane.bbclass   |    2 +-
 meta/classes/multilib.bbclass |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
meta/classes/insane.bbclass +1 -1
index 14d4a3c..c1afde5 100644
@@ -30,7 +30,7 @@ WARN_QA ?= "ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \
             textrel already-stripped incompatible-license files-invalid \
             installed-vs-shipped compile-host-path install-host-path \
             pn-overrides infodir build-deps file-rdeps \
-            unknown-configure-option symlink-to-sysroot \
+            unknown-configure-option symlink-to-sysroot multilib \
             "
 ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \
             perms dep-cmp pkgvarcheck perm-config perm-line perm-link \
meta/classes/multilib.bbclass +3 -2
index 2b5d356..8f61d8d 100644
@@ -132,8 +132,9 @@ python do_package_qa_multilib() {
                 (not i.startswith("rtld")) and (not i.startswith('kernel-vmlinux')):
                 candidates.append(i)
         if len(candidates) > 0:
-            bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s" 
-                   % (d.getVar('PN', True), pkg, ' '.join(candidates), var))
+            msg = "%s package %s - suspicious values '%s' in %s" \
+                   % (d.getVar('PN', True), pkg, ' '.join(candidates), var)
+            package_qa_handle_error("multilib", msg, d)
 
     ml = d.getVar('MLPREFIX', True)
     if not ml:
Signature · 1 line
1.7.9.5