Skip to contentSkip to conversation

A couple of minor fixes

PATCH New Paul Eggleton 1 participant 3 messages Mar 16, 2017

lore
Share & tools
lore
#0 lore raw

cover A couple of minor fixes

The following changes since commit 477805b913a6c4b4b630e42f08cd9e59f1e4e254:

wic: selftest: account for occasional newline in debugfs file names (2017-03-14 14:39:34 +0000)

are available in the git repository at:

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

Paul Eggleton (2):
classes/base: reformat HOSTTOOLS error
packagegroup-core-lsb: avoid rebuilding when changing layer config

 meta/classes/base.bbclass                                    | 2 +-
 meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
Signature · 1 line
2.9.3
#1 lore raw

PATCH 1/2 classes/base: reformat HOSTTOOLS error

Adjust the message slightly to make it clearer, in particular mentioning the HOSTTOOLS variable.

---
 meta/classes/base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/base.bbclass +1 -1
index fec351a..cf8748a 100644
@@ -136,7 +136,7 @@ def setup_hosttools_dir(dest, toolsvar, d, fatal=True):
             else:
                 notfound.append(tool)
     if notfound and fatal:
-        bb.fatal("These tools appear to be unavailable in PATH, please install them in order to proceed:\n%s" % " ".join(notfound))
+        bb.fatal("The following required tools (as specified by HOSTTOOLS) appear to be unavailable in PATH, please install them in order to proceed:\n  %s" % " ".join(notfound))
 
 addtask fetch
 do_fetch[dirs] = "${DL_DIR}"
Signature · 1 line
2.9.3
#2 lore raw

PATCH 2/2 packagegroup-core-lsb: avoid rebuilding when changing layer config

In reply to Paul Eggleton

It's regrettable that code in here is referring to BBFILE_COLLECTIONS, but it is, and the result is that this packagegroup will rebuild simply by adding or removing a layer which may be completely unrelated to whether you've got meta-qt4 or not. Add BBFILE_COLLECTIONS to vardepsexclude for the function to avoid this. (This was flagged up when testing the new yocto-compat-layer script - it understandably but undesirably reports it as a change caused by a layer).

---
 meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +2 -0
index 3aedf6b..a156bcb 100644
@@ -225,6 +225,8 @@ def get_libqt4(d):
                 'libraries. Its intended use is for passing LSB tests as Qt4 is ' \
                 'a requirement for LSB.')
     return ''
+# We don't want this to rebuild every time you change your layer config
+get_libqt4[vardepsexclude] += "BBFILE_COLLECTIONS"
 
 SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop"
 DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \
Signature · 1 line
2.9.3