Skip to contentSkip to conversation

meta: 4 fixes

PATCH In review Robert Yang 2 participants 6 messages Mar 11, 2015

lore
Share & tools
lore
#0 lore raw

cover meta: 4 fixes

The following changes since commit 99f209a49a4390192b95184ff86bd6f973010111:

layer.conf: bump version as error-report interface changed (2015-03-10 17:44:56 +0000)

are available in the git repository at:

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

Robert Yang (4):
license.bbclass: set dirs for do_populate_lic_setscene
mailx: disable parallel build
kernelsrc.bbclass: fix KERNEL_VERSION pixbufcache.bbclass: add harfbuzz-native to PIXBUFCACHE_SYSROOT_DEP

 meta/classes/kernelsrc.bbclass            |    2 +-
 meta/classes/license.bbclass              |    2 ++
 meta/classes/pixbufcache.bbclass          |    7 ++++++-
 meta/recipes-extended/mailx/mailx_12.5.bb |    5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/4 license.bbclass: set dirs for do_populate_lic_setscene

Fixed:
ERROR: Build of do_populate_lic failed
ERROR: Traceback (most recent call last):
File "bitbake/lib/bb/build.py", line 497, in exec_task
return _exec_task(fn, task, d, quieterr)
File "bitbake/lib/bb/build.py", line 437, in _exec_task
exec_func(func, localdata)
File "bitbake/lib/bb/build.py", line 212, in exec_func
exec_func_python(func, d, runfile, cwd=adir)
File "/home/nxadm/nx/ala-blade44.1/builds-2015-03-09-163005/qemuppc_world_oe_bp/bitbake/lib/bb/build.py", line 237, in exec_func_python
os.chdir(cwd)
OSError: [Errno 2] No such file or directory: 'bitbake_build/tmp/work/ppc7400-wrs-linux/taglib/1.9.1-r0/build'

When running setscene, the cwd is $B which maybe removed by autotools.bbclass or cmake.bbclass when rebuild.

---
 meta/classes/license.bbclass |    2 ++
 1 file changed, 2 insertions(+)
meta/classes/license.bbclass +2 -0
index 044b3b0..95e0121 100644
@@ -438,6 +438,8 @@ do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/"
 
 ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; license_create_manifest; "
 
+do_populate_lic_setscene[dirs] = "${LICSSTATEDIR}/${PN}"
+do_populate_lic_setscene[cleandirs] = "${LICSSTATEDIR}"
 python do_populate_lic_setscene () {
     sstate_setscene(d)
 }
Signature · 1 line
1.7.9.5
#2 lore raw

Re: [PATCH 1/4] license.bbclass: set dirs for do_populate_lic_setscene

Quoted 16 lines · Robert Yang

Fixed:
ERROR: Build of do_populate_lic failed
ERROR: Traceback (most recent call last):
File "bitbake/lib/bb/build.py", line 497, in exec_task
return _exec_task(fn, task, d, quieterr)
File "bitbake/lib/bb/build.py", line 437, in _exec_task
exec_func(func, localdata)
File "bitbake/lib/bb/build.py", line 212, in exec_func
exec_func_python(func, d, runfile, cwd=adir)
File
"/home/nxadm/nx/ala-blade44.1/builds-2015-03-09-163005/qemuppc_world_oe_bp/ bitbake/lib/bb/build.py", line 237, in exec_func_python
os.chdir(cwd)
OSError: [Errno 2] No such file or directory:
'bitbake_build/tmp/work/ppc7400-wrs-linux/taglib/1.9.1-r0/build'

Quoted 5 lines

When running setscene, the cwd is $B which maybe removed by autotools.bbclass or cmake.bbclass when rebuild.

For reference: https://bugzilla.yoctoproject.org/show_bug.cgi?id=4634

Signature · 5 lines
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
#3 lore raw

PATCH 2/4 mailx: disable parallel build

In reply to Robert Yang

The makeconfig can't run parallelly, otherwise the checking results might be incorrect and lead to errors:
fio.c:56:17: fatal error: ssl.h: No such file or directory

---
 meta/recipes-extended/mailx/mailx_12.5.bb |    5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-extended/mailx/mailx_12.5.bb +5 -0
index 080d71f..a53da3a 100644
@@ -29,3 +29,8 @@ inherit autotools-brokensep
 CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT"
 EXTRA_OEMAKE = "SENDMAIL=${sbindir}/sendmail"
 
+# The makeconfig can't run parallelly, otherwise the checking results
+# might be incorrect and lead to errors:
+# fio.c:56:17: fatal error: ssl.h: No such file or directory
+# #include <ssl.h>
+PARALLEL_MAKE = ""
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 3/4 kernelsrc.bbclass: fix KERNEL_VERSION

In reply to Robert Yang

The kernel-abiversion is now in STAGING_KERNEL_BUILDDIR not in S.

Fixed rpm pkg like perf: (note the None version)
perf-None-r9.qemux86.rpm

---
 meta/classes/kernelsrc.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernelsrc.bbclass +1 -1
index 4208eff..9efd46a 100644
@@ -4,7 +4,7 @@ do_unpack[depends] += "virtual/kernel:do_patch"
 do_unpack[noexec] = "1"
 do_patch[noexec] = "1"
 do_package[depends] += "virtual/kernel:do_populate_sysroot"
-KERNEL_VERSION = "${@get_kernelversion_file("${S}")}"
+KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}"
 
 inherit linux-kernel-base
 
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH 4/4 pixbufcache.bbclass: add harfbuzz-native to PIXBUFCACHE_SYSROOT_DEP

In reply to Robert Yang

Fixed:
DEBUG: Executing shell function pixbufcache_sstate_postinst
g_module_open() failed for sysroots/x86_64-linux/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so: libharfbuzz.so.0: cannot open shared object file: No such file or directory

---
 meta/classes/pixbufcache.bbclass |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/classes/pixbufcache.bbclass +6 -1
index b8d75bd..9e6ecc8 100644
@@ -67,6 +67,11 @@ pixbufcache_sstate_postinst() {
 # Packages that use this class should extend this variable with their runtime
 # dependencies.
 PIXBUFCACHE_SYSROOT_DEPS = ""
-PIXBUFCACHE_SYSROOT_DEPS_class-native = "${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene"
+PIXBUFCACHE_SYSROOT_DEPS_class-native = "\
+    ${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} \
+    glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \
+    libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \
+    harfbuzz-native:do_populate_sysroot_setscene \
+    "
 do_populate_sysroot_setscene[depends] += "${PIXBUFCACHE_SYSROOT_DEPS}"
 do_populate_sysroot[depends] += "${@d.getVar('PIXBUFCACHE_SYSROOT_DEPS', True).replace('_setscene','')}"
Signature · 1 line
1.7.9.5