[PATCH 0/4] Misc core fixes

[PATCH 0/4] Misc core fixes

[Paul Eggleton]

The following changes since commit 5eb0f6e03e5a543f7bad6fcf0cab4173cc8882d8:

  lz4: fix CC (2014-02-24 11:57:28 +0000)

are available in the git repository at:

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

Paul Eggleton (4):
  classes/sstate: fix taints being undone on execution of sstate tasks
  classes/package_tar: fix conflicts with package_deb / package_ipk
  classes/utility-tasks: make do_listtasks a little more friendly
  documentation.conf: add a few missing task descriptions

 meta/classes/package_tar.bbclass   |  7 ++++---
 meta/classes/sstate.bbclass        |  3 +++
 meta/classes/utility-tasks.bbclass | 17 ++++++++++++-----
 meta/conf/documentation.conf       |  4 ++++
 4 files changed, 23 insertions(+), 8 deletions(-)

-- 
1.8.5.3

[PATCH 1/4] classes/sstate: fix taints being undone on execution of sstate tasks

[Paul Eggleton]

The code here that deletes stamps was also deleting the taint files; so
forcing an sstate task with -f would force it to execute and then
because the taint file was deleted in the process, the next execution
would simply restore the output from sstate again. We need to exclude
the taint files just like we did in bb.build.make_stamp().

Fixes [YOCTO #5805].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/sstate.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index f7bd117..c4f437b 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -375,6 +375,9 @@ def sstate_clean(ss, d):
         # Keep the sigdata
         if ".sigdata." in stfile:
             continue
+        # Preserve taint files in the stamps directory
+        if stfile.endswith('.taint'):
+            continue
         if rm_stamp in stfile or rm_setscene in stfile or \
                 stfile.endswith(rm_nohash):
             oe.path.remove(stfile)
-- 
1.8.5.3

[PATCH 2/4] classes/package_tar: fix conflicts with package_deb / package_ipk

[Paul Eggleton]

Avoid tar noticing that the directory is changing when
do_package_write_deb or do_package_write_ipk are running at the same
time as do_package_write_tar (because DEBIAN and CONTROL are being added
and removed while tar is running so the directory changes).

Fixes [YOCTO #5652]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/package_tar.bbclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
index 2d6fc8f..fed2c28 100644
--- a/meta/classes/package_tar.bbclass
+++ b/meta/classes/package_tar.bbclass
@@ -41,11 +41,12 @@ python do_package_tar () {
         basedir = os.path.dirname(root)
         tarfn = localdata.expand("${DEPLOY_DIR_TAR}/${PKG}-${PKGV}-${PKGR}.tar.gz")
         os.chdir(root)
-        from glob import glob
-        if not glob('*'):
+        dlist = os.listdir(root)
+        if not dlist:
             bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True)))
             continue
-        ret = subprocess.call("tar -czf %s %s" % (tarfn, '.'), shell=True)
+        args = "tar -cz --exclude=CONTROL --exclude=DEBIAN -f".split()
+        ret = subprocess.call(args + [tarfn] + dlist)
         if ret != 0:
             bb.error("Creation of tar %s failed." % tarfn)
 }
-- 
1.8.5.3

[PATCH 3/4] classes/utility-tasks: make do_listtasks a little more friendly

[Paul Eggleton]

* Sort the list so it's at least in some form of logical order. I looked
  at sorting by dependencies, but that's a topological sort, and given
  no such function is shipped as part of the python standard libraries
  it would seem excessive to pull one in just for this. In any case, I'm
  not sure that for the data we have this would lead to any particularly
  pleasing result.
* Show the doc values as defined in documentation.conf (where present)
  as a description

Addresses [YOCTO #4856].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/utility-tasks.bbclass | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index 507e0f1..1792f18 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -1,13 +1,20 @@
 addtask listtasks
 do_listtasks[nostamp] = "1"
 python do_listtasks() {
-    import sys
-    # emit variables and shell functions
-    #bb.data.emit_env(sys.__stdout__, d)
-    # emit the metadata which isnt valid shell
+    taskdescs = {}
+    maxlen = 0
     for e in d.keys():
         if d.getVarFlag(e, 'task'):
-            bb.plain("%s" % e)
+            maxlen = max(maxlen, len(e))
+            if e.endswith('_setscene'):
+                desc = "%s (setscene version)" % (d.getVarFlag(e[:-9], 'doc') or '')
+            else:
+                desc = d.getVarFlag(e, 'doc') or ''
+            taskdescs[e] = desc
+
+    tasks = sorted(taskdescs.keys())
+    for taskname in tasks:
+        bb.plain("%s  %s" % (taskname.ljust(maxlen), taskdescs[taskname]))
 }
 
 CLEANFUNCS ?= ""
-- 
1.8.5.3

[PATCH 4/4] documentation.conf: add a few missing task descriptions

[Paul Eggleton]

We didn't really need these when the task descriptions were only used
for Toaster, but now we're showing them in -c listtasks they are useful
to have.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/conf/documentation.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index d1f491d..617fd2a 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -18,6 +18,8 @@ do_compile_ptest_base[doc] = "Compiles the runtime test suite included in the so
 do_configure[doc] = "Configures the source by enabling and disabling any build-time and configuration options for the software being built"
 do_configure_ptest_base[doc] = "Configures the runtime test suite included in the software being built"
 do_deploy[doc] = "Writes deployable output files to the deploy directory"
+do_devshell[doc] = "Starts a shell with the environment set up for development/debugging"
+do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel"
 do_fetch[doc] = "Fetches the source code"
 do_fetchall[doc] = "Fetches all remote sources required to build a target"
 do_generate_qt_config_file[doc] = "Writes a qt.conf file for building a Qt-based application"
@@ -27,6 +29,8 @@ do_kernel_checkout[doc] = "Checks out source/meta branches for a linux-yocto sty
 do_kernel_configcheck[doc] = "Validates the kernel configuration for a linux-yocto style kernel"
 do_kernel_configme[doc] = "Assembles the kernel configuration for a linux-yocto style kernel"
 do_kernel_link_vmlinux[doc] = "Creates a symbolic link in arch/$arch/boot for vmlinux kernel images"
+do_listtasks[doc] = "Lists all defined tasks for a target"
+do_menuconfig[doc] = "Runs 'make menuconfig' for the kernel"
 do_package[doc] = "Analyzes the content of the holding area and splits it into subsets based on available packages and files"
 do_package_index[doc] = "Creates or updates the index in the Package Feed area"
 do_package_write[doc] = "Creates the actual packages and places them in the Package Feed area"
-- 
1.8.5.3