[PATCH 1/5] classes/buildcfg: Move git/layer revision code into new OE module buildcfg

[PATCH 1/5] classes/buildcfg: Move git/layer revision code into new OE module buildcfg

[Richard Purdie]

There is a load of duplicated git/layer/revision code which makes
most sesne as a python library, not bbclass code. Start to refactor as such.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/base.bbclass            |  9 +++---
 meta/classes/buildhistory.bbclass    |  4 +--
 meta/classes/image-buildinfo.bbclass |  4 +--
 meta/classes/metadata_scm.bbclass    | 43 ++--------------------------
 meta/lib/oe/buildcfg.py              | 40 ++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 49 deletions(-)
 create mode 100644 meta/lib/oe/buildcfg.py

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index bdb3ac33c67..f59e95fef06 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -7,12 +7,11 @@ inherit staging
 inherit mirrors
 inherit utils
 inherit utility-tasks
-inherit metadata_scm
 inherit logging
 
 OE_EXTRA_IMPORTS ?= ""
 
-OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license oe.qa oe.reproducible oe.rust ${OE_EXTRA_IMPORTS}"
+OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license oe.qa oe.reproducible oe.rust oe.buildcfg ${OE_EXTRA_IMPORTS}"
 OE_IMPORTS[type] = "list"
 
 PACKAGECONFIG_CONFARGS ??= ""
@@ -35,6 +34,8 @@ def oe_import(d):
 # We need the oe module name space early (before INHERITs get added)
 OE_IMPORTED := "${@oe_import(d)}"
 
+inherit metadata_scm
+
 def lsb_distro_identifier(d):
     adjust = d.getVar('LSB_DISTRO_ADJUST')
     adjust_func = None
@@ -219,8 +220,8 @@ def get_source_date_epoch_value(d):
 def get_layers_branch_rev(d):
     layers = (d.getVar("BBLAYERS") or "").split()
     layers_branch_rev = ["%-20s = \"%s:%s\"" % (os.path.basename(i), \
-        base_get_metadata_git_branch(i, None).strip(), \
-        base_get_metadata_git_revision(i, None)) \
+        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
+        oe.buildcfg.get_metadata_git_revision(i, None)) \
             for i in layers]
     i = len(layers_branch_rev)-1
     p1 = layers_branch_rev[i].find("=")
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 4345ffc6939..f2493b3765a 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -761,8 +761,8 @@ def buildhistory_get_metadata_revs(d):
     # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want
     layers = (d.getVar("BBLAYERS") or "").split()
     medadata_revs = ["%-17s = %s:%s%s" % (os.path.basename(i), \
-        base_get_metadata_git_branch(i, None).strip(), \
-        base_get_metadata_git_revision(i, None), \
+        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
+        oe.buildcfg.get_metadata_git_revision(i, None), \
         buildhistory_get_modified(i)) \
             for i in layers]
     return '\n'.join(medadata_revs)
diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
index 94c585d4cd9..25ca8d8fe6b 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -46,8 +46,8 @@ def get_layer_git_status(path):
 def get_layer_revs(d):
     layers = (d.getVar("BBLAYERS") or "").split()
     medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \
-        base_get_metadata_git_branch(i, None).strip(), \
-        base_get_metadata_git_revision(i, None), \
+        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
+        oe.buildcfg.get_metadata_git_revision(i, None), \
         get_layer_git_status(i)) \
             for i in layers]
     return '\n'.join(medadata_revs)
diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
index 47cb969b8d8..f646b3159a4 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/meta/classes/metadata_scm.bbclass
@@ -1,44 +1,5 @@
-def base_detect_revision(d):
-    path = base_get_scmbasepath(d)
-    return base_get_metadata_git_revision(path, d)
 
-def base_detect_branch(d):
-    path = base_get_scmbasepath(d)
-    return base_get_metadata_git_branch(path, d)
-
-def base_get_scmbasepath(d):
-    return os.path.join(d.getVar('COREBASE'), 'meta')
-
-def base_get_metadata_svn_revision(path, d):
-    # This only works with older subversion. For newer versions 
-    # this function will need to be fixed by someone interested
-    revision = "<unknown>"
-    try:
-        with open("%s/.svn/entries" % path) as f:
-            revision = f.readlines()[3].strip()
-    except (IOError, IndexError):
-        pass
-    return revision
-
-def base_get_metadata_git_branch(path, d):
-    import bb.process
-
-    try:
-        rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path)
-    except bb.process.ExecutionError:
-        rev = '<unknown>'
-    return rev.strip()
-
-def base_get_metadata_git_revision(path, d):
-    import bb.process
-
-    try:
-        rev, _ = bb.process.run('git rev-parse HEAD', cwd=path)
-    except bb.process.ExecutionError:
-        rev = '<unknown>'
-    return rev.strip()
-
-METADATA_BRANCH := "${@base_detect_branch(d)}"
+METADATA_BRANCH := "${@oe.buildcfg.detect_branch(d)}"
 METADATA_BRANCH[vardepvalue] = "${METADATA_BRANCH}"
-METADATA_REVISION := "${@base_detect_revision(d)}"
+METADATA_REVISION := "${@oe.buildcfg.detect_revision(d)}"
 METADATA_REVISION[vardepvalue] = "${METADATA_REVISION}"
diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py
new file mode 100644
index 00000000000..a749fc53039
--- /dev/null
+++ b/meta/lib/oe/buildcfg.py
@@ -0,0 +1,40 @@
+
+import subprocess
+import bb.process
+
+def detect_revision(d):
+    path = get_scmbasepath(d)
+    return get_metadata_git_revision(path, d)
+
+def detect_branch(d):
+    path = get_scmbasepath(d)
+    return get_metadata_git_branch(path, d)
+
+def get_scmbasepath(d):
+    return os.path.join(d.getVar('COREBASE'), 'meta')
+
+def get_metadata_svn_revision(path, d):
+    # This only works with older subversion. For newer versions 
+    # this function will need to be fixed by someone interested
+    revision = "<unknown>"
+    try:
+        with open("%s/.svn/entries" % path) as f:
+            revision = f.readlines()[3].strip()
+    except (IOError, IndexError):
+        pass
+    return revision
+
+def get_metadata_git_branch(path, d):
+    try:
+        rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path)
+    except bb.process.ExecutionError:
+        rev = '<unknown>'
+    return rev.strip()
+
+def get_metadata_git_revision(path, d):
+    try:
+        rev, _ = bb.process.run('git rev-parse HEAD', cwd=path)
+    except bb.process.ExecutionError:
+        rev = '<unknown>'
+    return rev.strip()
+         
-- 
2.34.1

[PATCH 2/5] lib/buildcfg: Share common clean/dirty layer function

[Richard Purdie]

The comments even say this was copy/paste code. Move to a
shared library function.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/buildhistory.bbclass    | 18 +-----------------
 meta/classes/image-buildinfo.bbclass | 18 +-----------------
 meta/lib/oe/buildcfg.py              | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index f2493b3765a..6fffd471896 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -741,29 +741,13 @@ def buildhistory_get_build_id(d):
     statusheader = d.getVar('BUILDCFG_HEADER')
     return('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines)))
 
-def buildhistory_get_modified(path):
-    # copied from get_layer_git_status() in image-buildinfo.bbclass
-    import subprocess
-    try:
-        subprocess.check_output("""cd %s; export PSEUDO_UNLOAD=1; set -e;
-                                git diff --quiet --no-ext-diff
-                                git diff --quiet --no-ext-diff --cached""" % path,
-                                shell=True,
-                                stderr=subprocess.STDOUT)
-        return ""
-    except subprocess.CalledProcessError as ex:
-        # Silently treat errors as "modified", without checking for the
-        # (expected) return code 1 in a modified git repo. For example, we get
-        # output and a 129 return code when a layer isn't a git repo at all.
-        return " -- modified"
-
 def buildhistory_get_metadata_revs(d):
     # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want
     layers = (d.getVar("BBLAYERS") or "").split()
     medadata_revs = ["%-17s = %s:%s%s" % (os.path.basename(i), \
         oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
         oe.buildcfg.get_metadata_git_revision(i, None), \
-        buildhistory_get_modified(i)) \
+        oe.buildcfg.is_layer_modified(i)) \
             for i in layers]
     return '\n'.join(medadata_revs)
 
diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
index 25ca8d8fe6b..c149660f31a 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -26,29 +26,13 @@ def image_buildinfo_outputvars(vars, d):
         ret += "%s = %s\n" % (var, value)
     return ret.rstrip('\n')
 
-# Gets git branch's status (clean or dirty)
-def get_layer_git_status(path):
-    import subprocess
-    try:
-        subprocess.check_output("""cd %s; export PSEUDO_UNLOAD=1; set -e;
-                                git diff --quiet --no-ext-diff
-                                git diff --quiet --no-ext-diff --cached""" % path,
-                                shell=True,
-                                stderr=subprocess.STDOUT)
-        return ""
-    except subprocess.CalledProcessError as ex:
-        # Silently treat errors as "modified", without checking for the
-        # (expected) return code 1 in a modified git repo. For example, we get
-        # output and a 129 return code when a layer isn't a git repo at all.
-        return "-- modified"
-
 # Returns layer revisions along with their respective status
 def get_layer_revs(d):
     layers = (d.getVar("BBLAYERS") or "").split()
     medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \
         oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
         oe.buildcfg.get_metadata_git_revision(i, None), \
-        get_layer_git_status(i)) \
+        oe.buildcfg.is_layer_modified(i)) \
             for i in layers]
     return '\n'.join(medadata_revs)
 
diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py
index a749fc53039..a7549f1e229 100644
--- a/meta/lib/oe/buildcfg.py
+++ b/meta/lib/oe/buildcfg.py
@@ -37,4 +37,17 @@ def get_metadata_git_revision(path, d):
     except bb.process.ExecutionError:
         rev = '<unknown>'
     return rev.strip()
-         
+
+def is_layer_modified(path):
+    try:
+        subprocess.check_output("""cd %s; export PSEUDO_UNLOAD=1; set -e;
+                                git diff --quiet --no-ext-diff
+                                git diff --quiet --no-ext-diff --cached""" % path,
+                                shell=True,
+                                stderr=subprocess.STDOUT)
+        return ""
+    except subprocess.CalledProcessError as ex:
+        # Silently treat errors as "modified", without checking for the
+        # (expected) return code 1 in a modified git repo. For example, we get
+        # output and a 129 return code when a layer isn't a git repo at all.
+        return " -- modified"
-- 
2.34.1

[PATCH 3/5] buildcfg: Drop unused svn revision function

[Richard Purdie]

This isn't used anywhere and everyone is using git now, the functions
are now hardcoded as such too. Drop this function.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/lib/oe/buildcfg.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py
index a7549f1e229..364c40a2f02 100644
--- a/meta/lib/oe/buildcfg.py
+++ b/meta/lib/oe/buildcfg.py
@@ -13,17 +13,6 @@ def detect_branch(d):
 def get_scmbasepath(d):
     return os.path.join(d.getVar('COREBASE'), 'meta')
 
-def get_metadata_svn_revision(path, d):
-    # This only works with older subversion. For newer versions 
-    # this function will need to be fixed by someone interested
-    revision = "<unknown>"
-    try:
-        with open("%s/.svn/entries" % path) as f:
-            revision = f.readlines()[3].strip()
-    except (IOError, IndexError):
-        pass
-    return revision
-
 def get_metadata_git_branch(path, d):
     try:
         rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path)
-- 
2.34.1

[PATCH 4/5] base/buildhistory/image-buildinfo: Use common buildcfg function

[Richard Purdie]

Reduce code duplication to a common function in oe.buildcfg.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/base.bbclass            |  7 ++-----
 meta/classes/buildhistory.bbclass    | 10 +++-------
 meta/classes/image-buildinfo.bbclass |  8 ++------
 meta/lib/oe/buildcfg.py              |  7 +++++++
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f59e95fef06..20968a50766 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -218,11 +218,8 @@ def get_source_date_epoch_value(d):
     return oe.reproducible.epochfile_read(d.getVar('SDE_FILE'), d)
 
 def get_layers_branch_rev(d):
-    layers = (d.getVar("BBLAYERS") or "").split()
-    layers_branch_rev = ["%-20s = \"%s:%s\"" % (os.path.basename(i), \
-        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
-        oe.buildcfg.get_metadata_git_revision(i, None)) \
-            for i in layers]
+    revisions = oe.buildcfg.get_layer_revisions(d)
+    layers_branch_rev = ["%-20s = \"%s:%s\"" % (r[1], r[2], r[3]) for r in revisions]
     i = len(layers_branch_rev)-1
     p1 = layers_branch_rev[i].find("=")
     s1 = layers_branch_rev[i][p1:]
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 6fffd471896..4ba9ec8f25d 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -742,13 +742,9 @@ def buildhistory_get_build_id(d):
     return('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines)))
 
 def buildhistory_get_metadata_revs(d):
-    # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want
-    layers = (d.getVar("BBLAYERS") or "").split()
-    medadata_revs = ["%-17s = %s:%s%s" % (os.path.basename(i), \
-        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
-        oe.buildcfg.get_metadata_git_revision(i, None), \
-        oe.buildcfg.is_layer_modified(i)) \
-            for i in layers]
+    # We want an easily machine-readable format here
+    revisions = oe.buildcfg.get_layer_revisions(d)
+    medadata_revs = ["%-17s = %s:%s%s" % (r[1], r[2], r[3], r[4]) for r in revisions]
     return '\n'.join(medadata_revs)
 
 def outputvars(vars, listvars, d):
diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
index c149660f31a..d4a12b5e102 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -28,12 +28,8 @@ def image_buildinfo_outputvars(vars, d):
 
 # Returns layer revisions along with their respective status
 def get_layer_revs(d):
-    layers = (d.getVar("BBLAYERS") or "").split()
-    medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \
-        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
-        oe.buildcfg.get_metadata_git_revision(i, None), \
-        oe.buildcfg.is_layer_modified(i)) \
-            for i in layers]
+    revisions = oe.buildcfg.get_layer_revisions(d)
+    medadata_revs = ["%-17s = %s:%s%s" % (r[1], r[2], r[3], r[4]) for r in revisions]
     return '\n'.join(medadata_revs)
 
 def buildinfo_target(d):
diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py
index 364c40a2f02..90f5e057153 100644
--- a/meta/lib/oe/buildcfg.py
+++ b/meta/lib/oe/buildcfg.py
@@ -40,3 +40,10 @@ def is_layer_modified(path):
         # (expected) return code 1 in a modified git repo. For example, we get
         # output and a 129 return code when a layer isn't a git repo at all.
         return " -- modified"
+
+def get_layer_revisions(d):
+    layers = (d.getVar("BBLAYERS") or "").split()
+    revisions = []
+    for i in layers:
+        revisions.append((i, os.path.basename(i), get_metadata_git_branch(i, None).strip(), get_metadata_git_revision(i, None), is_layer_modified(i)))
+    return revisions
-- 
2.34.1

[PATCH 5/5] image-buildinfo: Improve and extend to SDK coverage too

[Richard Purdie]

Rename the default file from "build" to "buildinfo" since this is more
obvious to anyone looking in an image.

Add SDK_BUILDINFO_FILE and allow the same information to be written into
SDK images. This will be useful for buildtools-tarball and uninative-tarball.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/image-buildinfo.bbclass | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
index d4a12b5e102..ef790bb73b4 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -1,5 +1,5 @@
 #
-# Writes build information to target filesystem on /etc/build
+# Writes build information to target filesystem on /etc/buildinfo
 #
 # Copyright (C) 2014 Intel Corporation
 # Author: Alejandro Enedino Hernandez Samaniego <alejandro.hernandez@intel.com>
@@ -13,7 +13,8 @@
 IMAGE_BUILDINFO_VARS ?= "DISTRO DISTRO_VERSION"
 
 # Desired location of the output file in the image.
-IMAGE_BUILDINFO_FILE ??= "${sysconfdir}/build"
+IMAGE_BUILDINFO_FILE ??= "${sysconfdir}/buildinfo"
+SDK_BUILDINFO_FILE ??= "/buildinfo"
 
 # From buildhistory.bbclass
 def image_buildinfo_outputvars(vars, d):
@@ -40,11 +41,12 @@ def buildinfo_target(d):
         vars = (d.getVar("IMAGE_BUILDINFO_VARS") or "")
         return image_buildinfo_outputvars(vars, d)
 
-# Write build information to target filesystem
-python buildinfo () {
+python buildinfo() {
     if not d.getVar('IMAGE_BUILDINFO_FILE'):
         return
-    with open(d.expand('${IMAGE_ROOTFS}${IMAGE_BUILDINFO_FILE}'), 'w') as build:
+    destfile = d.expand('${BUILDINFODEST}${IMAGE_BUILDINFO_FILE}')
+    bb.utils.mkdirhier(os.path.dirname(destfile))
+    with open(destfile, 'w') as build:
         build.writelines((
             '''-----------------------
 Build Configuration:  |
@@ -62,4 +64,18 @@ Layer Revisions:      |
        ))
 }
 
-IMAGE_PREPROCESS_COMMAND += "buildinfo;"
+# Write build information to target filesystem
+python buildinfo_image () {
+    d.setVar("BUILDINFODEST", "${IMAGE_ROOTFS}")
+    bb.build.exec_func("buildinfo", d)
+}
+
+python buildinfo_sdk () {
+    d.setVar("BUILDINFODEST", "${SDK_OUTPUT}/${SDKPATH}")
+    d.setVar("IMAGE_BUILDINFO_FILE", d.getVar("SDK_BUILDINFO_FILE"))
+    bb.build.exec_func("buildinfo", d)
+}
+
+IMAGE_PREPROCESS_COMMAND += "buildinfo_image;"
+POPULATE_SDK_PRE_TARGET_COMMAND += "buildinfo_sdk;"
+
-- 
2.34.1

Re: [OE-core] [PATCH 1/5] classes/buildcfg: Move git/layer revision code into new OE module buildcfg

[Luca Ceresoli]

Hello Richard,

On Thu,  9 Jun 2022 12:37:28 +0100
"Richard Purdie" <richard.purdie@linuxfoundation.org> wrote:

> There is a load of duplicated git/layer/revision code which makes
> most sesne as a python library, not bbclass code. Start to refactor as such.

s/sesne/sense/

> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/classes/base.bbclass            |  9 +++---
>  meta/classes/buildhistory.bbclass    |  4 +--
>  meta/classes/image-buildinfo.bbclass |  4 +--
>  meta/classes/metadata_scm.bbclass    | 43 ++--------------------------
>  meta/lib/oe/buildcfg.py              | 40 ++++++++++++++++++++++++++
>  5 files changed, 51 insertions(+), 49 deletions(-)
>  create mode 100644 meta/lib/oe/buildcfg.py
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index bdb3ac33c67..f59e95fef06 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -7,12 +7,11 @@ inherit staging
>  inherit mirrors
>  inherit utils
>  inherit utility-tasks
> -inherit metadata_scm
>  inherit logging
>  
>  OE_EXTRA_IMPORTS ?= ""
>  
> -OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license oe.qa oe.reproducible oe.rust ${OE_EXTRA_IMPORTS}"
> +OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license oe.qa oe.reproducible oe.rust oe.buildcfg ${OE_EXTRA_IMPORTS}"
>  OE_IMPORTS[type] = "list"
>  
>  PACKAGECONFIG_CONFARGS ??= ""
> @@ -35,6 +34,8 @@ def oe_import(d):
>  # We need the oe module name space early (before INHERITs get added)
>  OE_IMPORTED := "${@oe_import(d)}"
>  
> +inherit metadata_scm
> +
>  def lsb_distro_identifier(d):
>      adjust = d.getVar('LSB_DISTRO_ADJUST')
>      adjust_func = None
> @@ -219,8 +220,8 @@ def get_source_date_epoch_value(d):
>  def get_layers_branch_rev(d):
>      layers = (d.getVar("BBLAYERS") or "").split()
>      layers_branch_rev = ["%-20s = \"%s:%s\"" % (os.path.basename(i), \
> -        base_get_metadata_git_branch(i, None).strip(), \
> -        base_get_metadata_git_revision(i, None)) \
> +        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
> +        oe.buildcfg.get_metadata_git_revision(i, None)) \
>              for i in layers]
>      i = len(layers_branch_rev)-1
>      p1 = layers_branch_rev[i].find("=")
> diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
> index 4345ffc6939..f2493b3765a 100644
> --- a/meta/classes/buildhistory.bbclass
> +++ b/meta/classes/buildhistory.bbclass
> @@ -761,8 +761,8 @@ def buildhistory_get_metadata_revs(d):
>      # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want
>      layers = (d.getVar("BBLAYERS") or "").split()
>      medadata_revs = ["%-17s = %s:%s%s" % (os.path.basename(i), \
> -        base_get_metadata_git_branch(i, None).strip(), \
> -        base_get_metadata_git_revision(i, None), \
> +        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
> +        oe.buildcfg.get_metadata_git_revision(i, None), \
>          buildhistory_get_modified(i)) \
>              for i in layers]
>      return '\n'.join(medadata_revs)
> diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
> index 94c585d4cd9..25ca8d8fe6b 100644
> --- a/meta/classes/image-buildinfo.bbclass
> +++ b/meta/classes/image-buildinfo.bbclass
> @@ -46,8 +46,8 @@ def get_layer_git_status(path):
>  def get_layer_revs(d):
>      layers = (d.getVar("BBLAYERS") or "").split()
>      medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \
> -        base_get_metadata_git_branch(i, None).strip(), \
> -        base_get_metadata_git_revision(i, None), \
> +        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
> +        oe.buildcfg.get_metadata_git_revision(i, None), \
>          get_layer_git_status(i)) \
>              for i in layers]
>      return '\n'.join(medadata_revs)
> diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
> index 47cb969b8d8..f646b3159a4 100644
> --- a/meta/classes/metadata_scm.bbclass
> +++ b/meta/classes/metadata_scm.bbclass
> @@ -1,44 +1,5 @@
> -def base_detect_revision(d):
> -    path = base_get_scmbasepath(d)
> -    return base_get_metadata_git_revision(path, d)
>  
> -def base_detect_branch(d):
> -    path = base_get_scmbasepath(d)
> -    return base_get_metadata_git_branch(path, d)

This causes failures because there still a user of base_detect_branch()
in meta/classes/report-error.bbclass

NameError: name 'base_detect_branch' is not defined

https://autobuilder.yoctoproject.org/typhoon/#/builders/113/builds/2527/steps/13/logs/stdio

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 1/5] classes/buildcfg: Move git/layer revision code into new OE module buildcfg

[Richard Purdie]

On Fri, 2022-06-10 at 16:14 +0200, Luca Ceresoli wrote:
> Hello Richard,
> 
> On Thu,  9 Jun 2022 12:37:28 +0100
> "Richard Purdie" <richard.purdie@linuxfoundation.org> wrote:
> 
> > There is a load of duplicated git/layer/revision code which makes
> > most sesne as a python library, not bbclass code. Start to refactor as such.
> 
> s/sesne/sense/
> 
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> >  meta/classes/base.bbclass            |  9 +++---
> >  meta/classes/buildhistory.bbclass    |  4 +--
> >  meta/classes/image-buildinfo.bbclass |  4 +--
> >  meta/classes/metadata_scm.bbclass    | 43 ++--------------------------
> >  meta/lib/oe/buildcfg.py              | 40 ++++++++++++++++++++++++++
> >  5 files changed, 51 insertions(+), 49 deletions(-)
> >  create mode 100644 meta/lib/oe/buildcfg.py
> > 
> > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> > index bdb3ac33c67..f59e95fef06 100644
> > --- a/meta/classes/base.bbclass
> > +++ b/meta/classes/base.bbclass
> > @@ -7,12 +7,11 @@ inherit staging
> >  inherit mirrors
> >  inherit utils
> >  inherit utility-tasks
> > -inherit metadata_scm
> >  inherit logging
> >  
> >  OE_EXTRA_IMPORTS ?= ""
> >  
> > -OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license oe.qa oe.reproducible oe.rust ${OE_EXTRA_IMPORTS}"
> > +OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license oe.qa oe.reproducible oe.rust oe.buildcfg ${OE_EXTRA_IMPORTS}"
> >  OE_IMPORTS[type] = "list"
> >  
> >  PACKAGECONFIG_CONFARGS ??= ""
> > @@ -35,6 +34,8 @@ def oe_import(d):
> >  # We need the oe module name space early (before INHERITs get added)
> >  OE_IMPORTED := "${@oe_import(d)}"
> >  
> > +inherit metadata_scm
> > +
> >  def lsb_distro_identifier(d):
> >      adjust = d.getVar('LSB_DISTRO_ADJUST')
> >      adjust_func = None
> > @@ -219,8 +220,8 @@ def get_source_date_epoch_value(d):
> >  def get_layers_branch_rev(d):
> >      layers = (d.getVar("BBLAYERS") or "").split()
> >      layers_branch_rev = ["%-20s = \"%s:%s\"" % (os.path.basename(i), \
> > -        base_get_metadata_git_branch(i, None).strip(), \
> > -        base_get_metadata_git_revision(i, None)) \
> > +        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
> > +        oe.buildcfg.get_metadata_git_revision(i, None)) \
> >              for i in layers]
> >      i = len(layers_branch_rev)-1
> >      p1 = layers_branch_rev[i].find("=")
> > diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
> > index 4345ffc6939..f2493b3765a 100644
> > --- a/meta/classes/buildhistory.bbclass
> > +++ b/meta/classes/buildhistory.bbclass
> > @@ -761,8 +761,8 @@ def buildhistory_get_metadata_revs(d):
> >      # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want
> >      layers = (d.getVar("BBLAYERS") or "").split()
> >      medadata_revs = ["%-17s = %s:%s%s" % (os.path.basename(i), \
> > -        base_get_metadata_git_branch(i, None).strip(), \
> > -        base_get_metadata_git_revision(i, None), \
> > +        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
> > +        oe.buildcfg.get_metadata_git_revision(i, None), \
> >          buildhistory_get_modified(i)) \
> >              for i in layers]
> >      return '\n'.join(medadata_revs)
> > diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
> > index 94c585d4cd9..25ca8d8fe6b 100644
> > --- a/meta/classes/image-buildinfo.bbclass
> > +++ b/meta/classes/image-buildinfo.bbclass
> > @@ -46,8 +46,8 @@ def get_layer_git_status(path):
> >  def get_layer_revs(d):
> >      layers = (d.getVar("BBLAYERS") or "").split()
> >      medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \
> > -        base_get_metadata_git_branch(i, None).strip(), \
> > -        base_get_metadata_git_revision(i, None), \
> > +        oe.buildcfg.get_metadata_git_branch(i, None).strip(), \
> > +        oe.buildcfg.get_metadata_git_revision(i, None), \
> >          get_layer_git_status(i)) \
> >              for i in layers]
> >      return '\n'.join(medadata_revs)
> > diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
> > index 47cb969b8d8..f646b3159a4 100644
> > --- a/meta/classes/metadata_scm.bbclass
> > +++ b/meta/classes/metadata_scm.bbclass
> > @@ -1,44 +1,5 @@
> > -def base_detect_revision(d):
> > -    path = base_get_scmbasepath(d)
> > -    return base_get_metadata_git_revision(path, d)
> >  
> > -def base_detect_branch(d):
> > -    path = base_get_scmbasepath(d)
> > -    return base_get_metadata_git_branch(path, d)
> 
> This causes failures because there still a user of base_detect_branch()
> in meta/classes/report-error.bbclass
> 
> NameError: name 'base_detect_branch' is not defined
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/113/builds/2527/steps/13/logs/stdio

You're right, sorry about that. Version in master-next updated.

Cheers,

Richard