Re: [PATCH] meta/image: allow customization of git command we use fo BUILD_ID

[Henning Schild <henning.schild@siemens.com>]

Hi,

in the previous one i wanted to start a discussion what the "correct"
git describe arguments would be. But there where not too many opinions
before it got merged.
I talked to Jan off list and he agreed that users should be able to
control it.
But now that i just saw the patch on the list i realize that this is
getting out of hand. I just introduced 2 variables and a new task, as
interface to the user. That seems to be overkill.

I will send an updated version, maybe of both patches.

Henning

Am Mon, 2 Jul 2018 20:19:57 +0200
schrieb Henning Schild <henning.schild@siemens.com>:

> One of the previous patches introduced the feature to leave some build
> system information in the rootfs. The git command to derive that
> information was kept pretty repository agnostic.
> 
> This patch makes the command Isar-specific and allows users to
> customize the command to their needs if they use a different tagging
> scheme in their repository.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta-isar/recipes-core/images/isar-image-base.bb |  1 +
>  meta/classes/image.bbclass                       | 13 +++++++------
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/meta-isar/recipes-core/images/isar-image-base.bb
> b/meta-isar/recipes-core/images/isar-image-base.bb index
> c72bfdb..2ae1c01 100644 ---
> a/meta-isar/recipes-core/images/isar-image-base.bb +++
> b/meta-isar/recipes-core/images/isar-image-base.bb @@ -25,6 +25,7 @@
> IMAGE_TRANSIENT_PACKAGES += "isar-cfg-localepurge" WORKDIR =
> "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" 
>  ISAR_GIT_RELEASE_PATH ?= "${LAYERDIR_isar}"
> +ISAR_GIT_RELEASE_CMD ?= "git -C ${ISAR_GIT_RELEASE_PATH} describe
> --tags --dirty --match 'v[0-9].[0-9]*'" 
>  do_rootfs[root_cleandirs] = "${IMAGE_ROOTFS} \
>                               ${IMAGE_ROOTFS}/isar-apt"
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 7935b69..d60c6bb 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -36,7 +36,8 @@ def get_rootfs_size(d):
>  
>  # we assume that one git commit can describe the whole image, so you
> should be # using submodules, kas, or something like that
> -# set ISAR_GIT_RELEASE_PATH to that one "most significant" layer
> +# set ISAR_GIT_RELEASE_PATH to that one "most significant" layer and
> adjust +# ISAR_GIT_RELEASE_ARGS according to your tagging
>  # when not using git, override do_mark_rootfs
>  def get_build_id(d):
>      import subprocess
> @@ -45,11 +46,11 @@ def get_build_id(d):
>           d.getVar("LAYERDIR_isar", True))):
>          bb.warn('You are using external layers that will not be
> considered' + ' in the build_id. Considder setting
> ISAR_GIT_RELEASE_PATH.')
> -    base = ["git", "-C", d.getVar("ISAR_GIT_RELEASE_PATH", True)]
> -    if (0 == subprocess.call(base + ["rev-parse"])):
> -        v = subprocess.check_output(base +
> -                                    ["describe", "--long", "--dirty",
> -                                     "--always"],
> universal_newlines=True)
> +    if (0 == subprocess.call(["git", "-C",
> +                              d.getVar("ISAR_GIT_RELEASE_PATH",
> True),
> +                              "rev-parse"])):
> +        cmd = d.getVar("ISAR_GIT_RELEASE_CMD", True)
> +        v = subprocess.check_output(cmd, shell=True,
> universal_newlines=True) return v.rstrip()
>      return ""
>