From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6572151760657317888 X-Received: by 2002:a19:3802:: with SMTP id f2-v6mr1409309lfa.16.1530604211424; Tue, 03 Jul 2018 00:50:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8448:: with SMTP id u8-v6ls400149ljh.14.gmail; Tue, 03 Jul 2018 00:50:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf4BAIVKM8JOhu5LbU0qRVOjCnpa7jWNliyGG7Tfk5mAgSUkVKdU3ViXXXwMycNjxTKY6l8 X-Received: by 2002:a2e:7c13:: with SMTP id x19-v6mr41186ljc.32.1530604210952; Tue, 03 Jul 2018 00:50:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530604210; cv=none; d=google.com; s=arc-20160816; b=jJcJBBzYQbh5nu+a5eO1jkVQq33byP+jxd+zRqrbTiKnvT///MIcAgrmFkz+4fN/00 qUrbhf4+6VJSKuKV2d5/Ux4JDgk0jQRr+1QeY4sOmSsNHfXsWRRu7D+AU2prsW0kWTL6 CVm3dbn8I0JCUYiWBDKAjxRAj8hMi6VwxICmnEQiFHT8pYYhCdCRQY9tyXGk2ny1MTyT 5xh7O0xsU+CWldQwjFbTomrHBVI+G6Es4rf/45ZB/GIG13xZ3NcpVaeQV03+BP+DbzPE fwILc03QA/OMKUyvNm1yq6mNY+jvjLb60jk8Bkn8cqBWiD7vLT9tKvdKBwtZdgtoY9u+ 4bBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=Vg9P0fNM/wIyVYCpQuaNoBPvWPiU8vagm0UYVTBDd8s=; b=sVO1Ob5cvV8bXaLwBa8bhQNiNP+xKhV0wNVl4cYa2KDr12XmAQL6DkDQC4651vq1tM hX7+XIyiZ5V39nkw2jl39Wj3slIhqBj0BYFQordARmmMaBCsAK5REze2TFG2WqiBrAqZ F4Syt7U1+5Zfvrd1+mZN9bV40HW3j0M+u63rhNjocTZSGWEbJ4cfxWozfG6hz4uZiJrI nTpxyDmBAkHt6nKJhZrHirIhMtfjecZTD9lxvaltqWhk6dfoCgmp8/cfQRPkK4fjUWS3 Ya9UOyHyl1qHD72juLtPwgiayf2h5DVbVjlN7CJfqTXc1BV3/k6Wbdtur11z5mCMmf4+ Ju5w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id s15-v6si11873lji.4.2018.07.03.00.50.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 00:50:10 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w637oAh2005148 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 3 Jul 2018 09:50:10 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w637o9aN029803; Tue, 3 Jul 2018 09:50:09 +0200 Date: Tue, 3 Jul 2018 09:50:09 +0200 From: Henning Schild To: Cc: "Maxim Yu . Osipov" , Jan Kiszka Subject: Re: [PATCH] meta/image: allow customization of git command we use fo BUILD_ID Message-ID: <20180703095009.443c4695@md1pvb1c.ad001.siemens.net> In-Reply-To: <20180702181957.12054-1-henning.schild@siemens.com> References: <4cb847ca-f5ce-6765-602e-9d5263746a3f@ilbers.de> <20180702181957.12054-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: 5BS/f3IYZ1aO obsolete, do not even look at that one. Sorry that the new one is missing the v2 in the subject. Henning Am Mon, 2 Jul 2018 20:19:57 +0200 schrieb Henning Schild : > 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 > --- > 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 "" >