From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6581172042600546304 X-Received: by 2002:a2e:95ce:: with SMTP id y14-v6mr1157791ljh.12.1532514878099; Wed, 25 Jul 2018 03:34:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9097:: with SMTP id l23-v6ls1541215ljg.8.gmail; Wed, 25 Jul 2018 03:34:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdf1fiMrsMMhHOtcgcfFyFZvAE2LMclnYr0pUrHVDGur1rYi1ZhldZ3O55z9DDWytdhUcmf X-Received: by 2002:a2e:3e11:: with SMTP id l17-v6mr1175603lja.25.1532514877829; Wed, 25 Jul 2018 03:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532514877; cv=none; d=google.com; s=arc-20160816; b=yqEwh4BrX73laJLVgXMU5KE3C0RyQ9j6eACZDvBgpsatcWqnvbYgtSBYSd5Es+D7QM TeOd7DUpufrJDAJ8k/RNj31vGbCNI9AwoXvXlE2yf08CrGmuIWOaq38OCapjvD2MXwi8 NrMFDmbRfJ8HJODsdwUk/aDTeYhdUf53lvhyrDwL+tHMDeDt+P++n6DszO32NK/WY7ay Y5zAIH0EBKIvC9Vkdhs8MD4rknK0cYJp1oRsHVancZiCwl4nPEm/enUNEh+s6GV5/yi5 c4dJ6hZPewKMAc9DaJCSvZS8Czw9IRWUl/k7fAfIspcnE2/7eaoFHrnvgX4M/AyXcQZh e4KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:from:references:cc:to :subject:arc-authentication-results; bh=DqBobzSt0nZnWE0vB2JT0ZfJsSBrQm7f2uZOWRp5i2k=; b=U3Co/oBLBGQJzoMYBtuD+HszHllGt5y9P5ER6cBSpX+3iFUpSdmW9oTxIgSP70xK7j VQMtquPrdr1ZMaxiETpLLSRhhC6IZE7Kx4Yx+xsnz9uHJ4T6c7KKI5wsot/4BG0rsr8R eqTOULUlE4wIjfqL6287PtKvXF1YAW+BCcYFVRzeU4npqXWQE8x6yoYXJ8tCwpufm5eW d7bB4dSpTKEPEdfe1/dxawIWBSc8Yas9uc3izgxZwWNQm60b2u19mD5mUfUdc/MyKm85 +K84P336bK5GOvWlMgo3XrU0ZubNvztb9o9CTzZKLINo7lQ1g93+Ia05GQ0YNmuuCemi Dzaw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id r18-v6si332449lfg.1.2018.07.25.03.34.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jul 2018 03:34:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.0.18] ([46.39.55.55]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w6PAYYPP023208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 25 Jul 2018 12:34:36 +0200 Subject: Re: [PATCH] meta/image: Rewrite get_build_id as shell function To: Jan Kiszka Cc: isar-users References: <1572b44a-f1c5-1fef-8296-1b1d3a5f2f23@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: Date: Wed, 25 Jul 2018 13:34:29 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <1572b44a-f1c5-1fef-8296-1b1d3a5f2f23@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: kqW2TnF7lWTY On 07/23/2018 01:28 AM, Jan Kiszka wrote: > This avoid warning the user multiple times because get_build_id gets > called each time the class is evaluated. Applied to the 'next', Thanks, Maxim. > Signed-off-by: Jan Kiszka > --- > > Builds on top of Henning's "meta/image: allow customization of command > we use fo BUILD_ID" > > meta/classes/image.bbclass | 29 +++++++++++++---------------- > 1 file changed, 13 insertions(+), 16 deletions(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 6f2a140..990aff3 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -38,21 +38,18 @@ def get_rootfs_size(d): > # this could be "git describe" or something similar. > # set ISAR_RELEASE_CMD to customize, or override do_mark_rootfs to do something > # completely different > -def get_build_id(d): > - import subprocess > - if (len(d.getVar("BBLAYERS", True).strip().split(' ')) != 2 and > - (d.getVar("ISAR_RELEASE_CMD", True) == > - d.getVar("ISAR_RELEASE_CMD_DEFAULT", True))): > - bb.warn('You are using external layers that will not be considered' + > - ' in the build_id. Consider changing ISAR_RELEASE_CMD.') > - cmd = d.getVar("ISAR_RELEASE_CMD", True) > - try: > - v = subprocess.check_output(cmd, shell=True, universal_newlines=True) > - return v.rstrip() > - except subprocess.CalledProcessError as e: > - bb.warn('\"%s\" returned %d, returning empty build_id' % > - (e.cmd, e.returncode)) > - return "" > +get_build_id() { > + if [ $(echo ${BBLAYERS} | wc -w) -ne 2 ] && > + [ "${ISAR_RELEASE_CMD}" = "${ISAR_RELEASE_CMD_DEFAULT}" ]; then > + bbwarn "You are using external layers that will not be" \ > + "considered in the build_id. Consider changing" \ > + "ISAR_RELEASE_CMD." > + fi > + if ! ${ISAR_RELEASE_CMD} 2>/dev/null; then > + bbwarn "\"${ISAR_RELEASE_CMD}\" failed, returning empty build_id." > + echo "" > + fi > +} > > python set_image_size () { > rootfs_size = get_rootfs_size(d) > @@ -78,7 +75,7 @@ do_rootfs[deptask] = "do_deploy_deb" > > do_mark_rootfs() { > update_etc_os_release \ > - --build-id "${@get_build_id(d)}" --variant "${DESCRIPTION}" \ > + --build-id $(get_build_id) --variant "${DESCRIPTION}" \ > "${IMAGE_ROOTFS}" > } > > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov