Skip to contentSkip to conversation

Misc core fixes

PATCH New Paul Eggleton 1 participant 5 messages Feb 17, 2014

lore
Share & tools
lore
#0 lore raw

cover Misc core fixes

Some miscellaneous fixes for issues found when using Hob, trying to restore from shared state and building an image at the same time as an SDK.

The following changes since commit 11e2aaf2d751277e3e99ac2acbbeff2b7227be94:

lib/oe/package_manager: Make empty package directories non-fatal (2014-02-16 16:30:58 +0000)

are available in the git repository at:

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

Paul Eggleton (4):
bitbake.conf: add BBINCLUDED and BB_INVALIDCONF to config hash
whitelist
eglibc-locale: add eglibc-gconv to PACKAGES_DYNAMIC classes/populate_sdk_base: fix race condition with do_rootfs classes/populate_sdk_base: optimise task dependencies

 meta/classes/populate_sdk_base.bbclass     | 4 +++-
 meta/conf/bitbake.conf                     | 2 +-
 meta/recipes-core/eglibc/eglibc-locale.inc | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 1/4 bitbake.conf: add BBINCLUDED and BB_INVALIDCONF to config hash whitelist

These variables should not influence the config hash, i.e. changing them shouldn't trigger a reparse of the metadata, so whitelist them.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 4fb6a1c..f81dea6 100644
@@ -771,7 +771,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \
     WARN_QA ERROR_QA WORKDIR"
 BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
     SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
-    PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV"
+    PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED"
 BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends \
     lockfiles type vardepsexclude vardeps vardepvalue file-checksums python \
     func task export unexport noexec nostamp dirs cleandirs \
Signature · 1 line
1.8.5.3
#2 lore raw

PATCH 2/4 eglibc-locale: add eglibc-gconv to PACKAGES_DYNAMIC

In reply to Paul Eggleton

If you try to add eglibc-gconv to an image, you'll get a NoProvider error because nothing at parse time states that it provides this (it's added to PACKAGES in populate_packages). This problem manifests itself in Hob for example when customising an image.

---
 meta/recipes-core/eglibc/eglibc-locale.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/eglibc/eglibc-locale.inc +2 -1
index e615e51..4da5abd 100644
@@ -35,7 +35,8 @@ PACKAGES = "localedef ${PN}-dbg"
 
 PACKAGES_DYNAMIC = "^locale-base-.* \
                     ^eglibc-gconv-.* ^eglibc-charmap-.* ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
-                    ^glibc-gconv-.*  ^glibc-charmap-.*  ^glibc-localedata-.*  ^glibc-binary-localedata-.*"
+                    ^glibc-gconv-.*  ^glibc-charmap-.*  ^glibc-localedata-.*  ^glibc-binary-localedata-.* \
+                    ^${MLPREFIX}eglibc-gconv$"
 
 # Create a eglibc-binaries package
 ALLOW_EMPTY_${BPN}-binaries = "1"
Signature · 1 line
1.8.5.3
#3 lore raw

PATCH 3/4 classes/populate_sdk_base: fix race condition with do_rootfs

In reply to Paul Eggleton

do_rootfs has ${S} in cleandirs, and during do_populate_sdk we call exec_func() several times, which by default uses ${B} as the working directory. If do_populate_sysroot and do_rootfs race against eachother, the directory may not exist at the exact instant that the setup code for do_populate_sdk tries to cd into it. We don't actually use ${B} for do_populate_sysroot so we can set it to something else just for that task to avoid the race.

NOTE: because this task name contains an underscore, the override will not work; the BitBake patch that changes these to hyphens for the task override is required for this patch to work (but won't break things without it.)

---
 meta/classes/populate_sdk_base.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/populate_sdk_base.bbclass +2 -0
index ee2a7c1..e2e013a 100644
@@ -26,6 +26,8 @@ SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 
+B_task-populate-sdk = "${SDK_DIR}"
+
 SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
 
 TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${MACHINE}"
Signature · 1 line
1.8.5.3
#4 lore raw

PATCH 4/4 classes/populate_sdk_base: optimise task dependencies

In reply to Paul Eggleton

We don't need to depend on do_package anymore after the split out of do_packagedata (which happened a while back in OE-Core commit 6107ee294afde395e39d084c33e8e94013c625a9). We do need dependencies on do_packagedata though since the SDK construction needs to make use of the pkgdata files.

---
 meta/classes/populate_sdk_base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/populate_sdk_base.bbclass +1 -1
index e2e013a..235d672 100644
@@ -333,5 +333,5 @@ populate_sdk_log_check() {
 do_populate_sdk[dirs] = "${TOPDIR}"
 do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])}"
 do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}"
-do_populate_sdk[recrdeptask] = "do_package_write"
+do_populate_sdk[recrdeptask] += "do_packagedata"
 addtask populate_sdk
Signature · 1 line
1.8.5.3