From patchwork Thu Sep 22 12:24:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 13125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DA68C6FA82 for ; Thu, 22 Sep 2022 12:24:16 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web08.6457.1663849454095905714 for ; Thu, 22 Sep 2022 05:24:14 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1obLFT-00EUyH-Ed; Thu, 22 Sep 2022 15:24:11 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1obLFT-0009Oz-BD; Thu, 22 Sep 2022 15:24:11 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH 1/2] poky.conf: allow changes to DISTRO_VERSION, SDK_VERSION and MAINTAINER Date: Thu, 22 Sep 2022 15:24:01 +0300 Message-Id: <20220922122402.32710-1-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Rspam-Score: -1.2 (-) X-Rspam-Report: Action: no action Symbol: RCVD_TLS_LAST(0.00) Symbol: ARC_NA(0.00) Symbol: DMARC_POLICY_SOFTFAIL(0.10) Symbol: FROM_HAS_DN(0.00) Symbol: TO_DN_SOME(0.00) Symbol: R_MISSING_CHARSET(0.50) Symbol: TO_MATCH_ENVRCPT_ALL(0.00) Symbol: MIME_GOOD(-0.10) Symbol: RCPT_COUNT_TWO(0.00) Symbol: MID_CONTAINS_FROM(1.00) Symbol: R_SPF_NA(0.00) Symbol: FORGED_SENDER(0.30) Symbol: R_DKIM_NA(0.00) Symbol: MIME_TRACE(0.00) Symbol: ASN(0.00) Symbol: FROM_NEQ_ENVFROM(0.00) Symbol: BAYES_HAM(-3.00) Symbol: RCVD_COUNT_TWO(0.00) Message-ID: 20220922122402.32710-1-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 22 Sep 2022 12:24:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170969 For users who build their own variants of poky, they want to stay close to poky.conf and thus use it, but would still like to change the version details and maintainers to their own. With this change these variables can be changed in local.conf, for example. Signed-off-by: Mikko Rapeli --- meta-poky/conf/distro/poky.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 856c88554d..6df71ce18a 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf @@ -1,12 +1,12 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "4.1+snapshot-${METADATA_REVISION}" +DISTRO_VERSION ?= "4.1+snapshot-${METADATA_REVISION}" DISTRO_CODENAME = "langdale" SDK_VENDOR = "-pokysdk" -SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" +SDK_VERSION ?= "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" SDK_VERSION[vardepvalue] = "${SDK_VERSION}" -MAINTAINER = "Poky " +MAINTAINER ?= "Poky " TARGET_VENDOR = "-poky" From patchwork Thu Sep 22 12:24:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 13126 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20814C6FA86 for ; Thu, 22 Sep 2022 12:24:26 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web11.6452.1663849457801816910 for ; Thu, 22 Sep 2022 05:24:18 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1obLFX-00EUzZ-B1; Thu, 22 Sep 2022 15:24:15 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1obLFX-0009hO-8e; Thu, 22 Sep 2022 15:24:15 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org Cc: Mikko Rapeli Subject: [PATCH 2/2] git-describe.bbclass: add new class for "git describe --tags --allways --dirty" Date: Thu, 22 Sep 2022 15:24:02 +0300 Message-Id: <20220922122402.32710-2-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220922122402.32710-1-mikko.rapeli@linaro.org> References: <20220922122402.32710-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 X-Rspam-Score: -1.2 (-) X-Rspam-Report: Action: no action Symbol: RCVD_TLS_LAST(0.00) Symbol: ARC_NA(0.00) Symbol: DMARC_POLICY_SOFTFAIL(0.10) Symbol: FROM_HAS_DN(0.00) Symbol: TO_DN_SOME(0.00) Symbol: R_MISSING_CHARSET(0.50) Symbol: TO_MATCH_ENVRCPT_ALL(0.00) Symbol: MIME_GOOD(-0.10) Symbol: RCPT_COUNT_TWO(0.00) Symbol: MID_CONTAINS_FROM(1.00) Symbol: R_SPF_NA(0.00) Symbol: FORGED_SENDER(0.30) Symbol: R_DKIM_NA(0.00) Symbol: MIME_TRACE(0.00) Symbol: ASN(0.00) Symbol: FROM_NEQ_ENVFROM(0.00) Symbol: BAYES_HAM(-3.00) Symbol: RCVD_COUNT_TWO(0.00) Message-ID: 20220922122402.32710-2-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 22 Sep 2022 12:24:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170970 Output from git_describe() function can then be used in various places and from various git trees to create a user friend(lier) name to builds. Examples where this could be used is BUILD_ID, SDK_VERSION and IMAGE_VERSION_SUFFIX. Signed-off-by: Mikko Rapeli --- meta/classes/git-describe.bbclass | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta/classes/git-describe.bbclass diff --git a/meta/classes/git-describe.bbclass b/meta/classes/git-describe.bbclass new file mode 100644 index 0000000000..3a2b06b3fd --- /dev/null +++ b/meta/classes/git-describe.bbclass @@ -0,0 +1,24 @@ +# Defines a simple function which calls 'git describe --tags --always --dirty' +# on specified directory and returns the string. +# +# Can be used for example to easily generate a BUILD_ID in local.conf if +# TOPDIR build directory is under the main git tree for the project: +# INHERIT += "git-describe" +# BUILD_ID = "${@git_describe("${TOPDIR}/../meta-mylayer", d)}" +# # BUILD_ID to /etc/os-release +# OS_RELEASE_FIELDS:append:pn-os-release = " BUILD_ID" +# # Add os-release to all images +# IMAGE_INSTALL:append = " os-release" +# # BUILD_ID to image file name +# IMAGE_VERSION_SUFFIX = "-${BUILD_ID}" +# # BUILD_ID to SDK file names and paths +# SDK_VERSION = "${BUILD_ID}" + +def git_describe(p, d): + import bb.process + try: + describe, _ = bb.process.run('git describe --tags --always --dirty', cwd=p) + except bb.process.ExecutionError: + describe = '' + return describe.strip() +