[PATCH 0/2] Fix for do_populate_sysroot signature issue

[PATCH 0/2] Fix for do_populate_sysroot signature issue

[Paul Eggleton]

The following changes since commit 4a47c943a76e79af82d47d8fa83c6687e0d915a0:

  busybox: disable fsck.minix and mkfs.minix (2014-03-23 09:08:49 +0000)

are available in the git repository at:

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

Paul Eggleton (2):
  classes/staging: ensure do_populate_sysroot re-execs on changes to
    sysroot preprocessing funcs
  classes/binconfig: fix indentation in python function

 meta/classes/binconfig.bbclass | 44 +++++++++++++++++++++---------------------
 meta/classes/staging.bbclass   |  2 ++
 2 files changed, 24 insertions(+), 22 deletions(-)

-- 
1.8.5.3

[PATCH 1/2] classes/staging: ensure do_populate_sysroot re-execs on changes to sysroot preprocessing funcs

[Paul Eggleton]

Without this dependency, changes to functions added to
SYSROOT_PREPROCESS_FUNCS do not change do_populate_sysroot's signature
and thus don't cause it to re-execute.

Fixes [YOCTO #5852].

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

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index d17a53e..644b9a8 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -95,6 +95,8 @@ python do_populate_sysroot () {
         bb.build.exec_func(f, d)
 }
 
+do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}"
+
 SSTATETASKS += "do_populate_sysroot"
 do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}"
 do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}"
-- 
1.8.5.3

[PATCH 2/2] classes/binconfig: fix indentation in python function

[Paul Eggleton]

If we don't fix this, the recently added dependency from
do_populate_sysroot on functions in SYSROOT_PREPROCESS_FUNCS in
staging.bbclass triggers warnings that the get_binconfig_mangle
function contains tabs for all recipes that inherit binconfig.

Related to fix for [YOCTO #5852].

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

diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 848c744..7158c8c 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -2,29 +2,29 @@ FILES_${PN}-dev += "${bindir}/*-config"
  
 # The namespaces can clash here hence the two step replace
 def get_binconfig_mangle(d):
-	s = "-e ''"
-	if not bb.data.inherits_class('native', d):
-		optional_quote = r"\(\"\?\)"
-		s += " -e 's:=%s${base_libdir}:=\\1OEBASELIBDIR:;'" % optional_quote
-		s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
-		s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
-		s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
-		s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote
-		s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
-		s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
-		s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
-		s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
-		s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
-		s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
-		s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
-		s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
-		s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
-		s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
-		s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
-		if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
-			s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d)
+    s = "-e ''"
+    if not bb.data.inherits_class('native', d):
+        optional_quote = r"\(\"\?\)"
+        s += " -e 's:=%s${base_libdir}:=\\1OEBASELIBDIR:;'" % optional_quote
+        s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
+        s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
+        s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
+        s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote
+        s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
+        s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
+        s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
+        s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
+        s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
+        s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
+        s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
+        s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
+        s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
+        s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
+        s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
+        if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
+            s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d)
 
-	return s
+    return s
 
 BINCONFIG_GLOB ?= "*-config"
 
-- 
1.8.5.3