From patchwork Mon Apr 17 13:27:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinuvasan Arjunan X-Patchwork-Id: 2771 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 17 Apr 2023 15:28:22 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 33HDSMHN020790 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Apr 2023 15:28:22 +0200 Received: by mail-lf1-f56.google.com with SMTP id o10-20020a056512052a00b004b53d7241f6sf8226971lfc.4; Mon, 17 Apr 2023 06:28:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1681738096; cv=pass; d=google.com; s=arc-20160816; b=OMdP1NiX4K4vR9ffqMOD/c9QhDRA92qLCxgrWyC5x7KPD85ekDXgvsUMDDqwl0F1VV NrBcd2bcP8C7KYocT69sV9ZO9zceTOhu1ZLsdPQx7pS3MCie7FolWfilOHe2PCwmGBbR WTX9xdLXrb+dgzyq29TsK5rspu7qO4pqZf0/XkD9QZz/gN+E3HdZstk6/sHXtjGbnG+1 KeMDbSOapJMl6u0QLAiWunozo/oGvfBDEjsrufPZ1aqVc3Ieta+h7P+nE1eK6pyBG3YC +8+8ZzSNnGAEuBM2Q2Gx4mNICg7zi5P/As5CuYU507hEkBlUcQgczoyvdG+nKuCXcYej a0YA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:sender :dkim-signature; bh=hh7rwjGzvH1a0YE7/05Hw1uaKz8Y8+0rGmiuzblk5IM=; b=jQmRZ/yghoSlenCXZNI0Ncy+rxFdqJhWMJWE4Lba/r2E3vcTjnm0nBLF3rzSo3Vu4l XbcRJLSzeHxm3nZ73RCBQCFvgdeWnNUaQsltYMZdh7IP/beYj2ThGbWnlwYSg3f2pvTz +FNGcOOiGn7BHGbJHNTd9tux2jbQuXijeEhfge4YWu0f97R3fP2W/4REfKKpSjsZveks MdTcGavp2mUvftHv7yJPPGf9V6jvbUp2T87DaIJlCqaNWZqVNcOcSn16hyVOChTh8y4o 9YmmFXqeD+x5GlXvNlh1fa+x3fGY9FAFFcBh30SkzGwot5XPCxyUjuBrq7pWtCaEzAUD l+UQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1681738096; x=1684330096; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:ironport-sdr:sender:from:to:cc:subject:date :message-id:reply-to; bh=hh7rwjGzvH1a0YE7/05Hw1uaKz8Y8+0rGmiuzblk5IM=; b=nk+gzfhrVF8OucTPLwZelQCduIfF+JWW7Irux7zrGnY+lJCKepacg4m8a9lBQeKKaV cTLZZblxrpSFY1Gwu+xdKpEXUWXi0oJ6YYmdvW16tGbVTjBtWHEeUxaqFsHnzF5sHw2/ U8QHpcNqmoZZLkFhYyYxUSMf4t9ixboauWKEu0KM5rPg6WZ4VxNm0WeTXdqKyF7prSDq RYvpKO6J7IINq0cj+hDFXqTMQCHCQutxVMC7AOHarv/0mfldr17cbKsfAJ1vT/XWL8KH Ya1l1rqQsO6W3Xt5N2800uPI/jnrgAHRZiOgIO3kKq/xaBTQP90CAYR8bxbJu7H+fLan bekA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738096; x=1684330096; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:x-beenthere:x-gm-message-state:sender:from:to:cc :subject:date:message-id:reply-to; bh=hh7rwjGzvH1a0YE7/05Hw1uaKz8Y8+0rGmiuzblk5IM=; b=Kb591SkmHstLLPeIeM2Man6b7hWEOxnwsK7nj0hFNKWt3dVy7Qwz+8n3WeEztTEWf5 z6YT58VIkblfPux9LhxNiq6s0VoZcE4IMxYmWERI9Brrc9SgU4gi35Eog26qKUwo4pzq v58kd5f2w5IhDeqzXJAG9rKfNGdqYPLCeeAes8khLGckP+qUaU1tN/kPpCQLblnTKCy0 /i70m0NPOaCNjtehQx+9ird9TIDFAXUTvanuwGdQgIw/J+gQNG8UVO+qHpdKRazKu0yL n4Z49zjtWAZPtwuacaGRmsVG3l69h/n/dVJKKTkaOIkd0sR9voqTN+7ZbLVpiHs6HOMM mibg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AAQBX9e99rBR5czHB84Y2H6YUphcGmvAmymZB03cp3V8AEuoYdTPUhog I+BH4brQDp7F72JD//mhSqo= X-Google-Smtp-Source: AKy350Zqfghfx4pweps+vD+udX/D/SwwQpE+vQ3BJfaQZajRXRVEy5sZucKdIBFRJR77UCJ7YRmlqw== X-Received: by 2002:a2e:9811:0:b0:2a7:653d:1676 with SMTP id a17-20020a2e9811000000b002a7653d1676mr4641974ljj.2.1681738096168; Mon, 17 Apr 2023 06:28:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b10:b0:4ed:c108:7214 with SMTP id f16-20020a0565123b1000b004edc1087214ls711779lfv.3.-pod-prod-gmail; Mon, 17 Apr 2023 06:28:14 -0700 (PDT) X-Received: by 2002:a05:6512:21ca:b0:4ec:82ce:9cfa with SMTP id d10-20020a05651221ca00b004ec82ce9cfamr2027792lft.31.1681738094684; Mon, 17 Apr 2023 06:28:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681738094; cv=none; d=google.com; s=arc-20160816; b=hhGugEuMVpapqUaBKXIIcpLba2NyFrgamhGTNEowqE9LojnnnRnc1tpsb6COZ+5FGY 6IU52wKIwUTuP7avcLCuViAc55A5LISbkZv5JOSTqekPI+Es5WStspbI5s2v9re3kWoc XOPXOjtS6wrYnw5J/7/lZUpQl6mkLdVf12/msRjp6wDD5RXuR0tDYjuySS5NbalLOqLH O2Ej9JKHOdnb5hVEntIV9ijSR+NSkmyOucZTOunp4KLrgNYgBqntylApkX5lY8yi/e6z 8hd7FKhcsTrHt2HTAXi3vDooCO6B0kCmrkcrCs+reAc+sD8lWuo+SFDtSRSmCtD8xVIg MKig== 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:date:subject:cc:to:from:ironport-sdr; bh=LRjiws6fQem3NQ39P8xgQG1mgtK46TiQaVLXSRnPEDI=; b=dS+dZZQWKPz7eoZS+Nk3y96+DkJKKjWeuaffIbmzyNZHMIbL5uEcntoDnl1YuRo5AI FiwSNwEuFFjTX5kOvBMCFm1p9lEWP3wYjulTo7rMT+34MhEaahgsDsWK/UAuP+7zuACw OkjxTnFcyu1UGZIc2KAIMnUOpmE0KIEHLPgohwFEvGxViDXYXXKqGxELL2itfkZeYhQt IvUa9yTLSSuDMEtIwkc+B1ZKnnzcYlc/qHKxDI6lOVHkpera7+KJRk8CfNE5WlZ/L4FA X8OZ7is4GdOawxuEZAD0YMxatCx0L9lQ1+ptSMY+b09UO9ZgbgtARyPRVbWHwqxORYyD tqdA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id bp25-20020a056512159900b004dc4c1e0df8si580102lfb.11.2023.04.17.06.28.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Apr 2023 06:28:14 -0700 (PDT) Received-SPF: pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; X-IronPort-AV: E=Sophos;i="5.99,204,1677571200"; d="scan'208";a="2678356" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 17 Apr 2023 05:27:55 -0800 IronPort-SDR: L9i7lgEVw8sc8uCIK8qlOFoI5Se8kDSzVIaJHIQRENFuDgz4612y6X93R8jigZE66GiRhLragU yDXcJU8nnBs6NYKrM/rDfPn0T4ZN++TUUf78JzXYSvMz78OPeKsjAelhF3UmtJqixi+/MX/37i UQQSGQQKDA/iTzGUxfKgUItDtbFwMmBP2irzVWzr6ReDvBAnSEvaDscF/aZeSDNINl4vAih7Oa Znjs61HiwlN3hwGDDY0QuAqrVbN0+IDTYcd6yBqR/WvCGgVCjtwswmFCTPn0DRCT9+0TUsMqvl b/c= From: Srinuvasan Arjunan To: CC: , Srinuvasan A Subject: [PATCH] meta/conf/bitbake.conf: enable SRCPV support for AUTOREV Date: Mon, 17 Apr 2023 18:57:34 +0530 Message-ID: <20230417132734.1023825-1-srinuvasan_a@mentor.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <526d9fd9-a8ab-ba29-d925-6c77afaaf985@siemens.com> References: <526d9fd9-a8ab-ba29-d925-6c77afaaf985@siemens.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-10.mgc.mentorg.com (147.34.90.210) To svr-orw-mbx-13.mgc.mentorg.com (147.34.90.213) X-Original-Sender: srinuvasan_a@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Srinuvasan A One of our downstream project recipe uses `SRCREV = "${AUTOREV}"` to get the latest changes always, but this not works after bitbake 2 migration, it throws the below error. do_fetch: Fetcher failure: Recipe uses a floating tag/branch without a fixed SRCREV yet doesn't call bb.fetch2.get_srcrev() (use SRCPV in PV for OE). Till now we don't have support for SRCPV in ISAR, hence add this support as like OE. Signed-off-by: Srinuvasan A --- meta/classes/base.bbclass | 26 ++++++++++++++++++++++++++ meta/conf/bitbake.conf | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 53550ae..f631483 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -120,6 +120,32 @@ root_cleandirs() { python() { import re + needsrcrev = False + srcuri = d.getVar('SRC_URI') + for uri_string in srcuri.split(): + uri = bb.fetch.URI(uri_string) + # Svn packages should DEPEND on subversion-native + if uri.scheme == "svn": + needsrcrev = True + + # Git packages should DEPEND on git-native + elif uri.scheme in ("git", "gitsm"): + needsrcrev = True + + # Mercurial packages should DEPEND on mercurial-native + elif uri.scheme == "hg": + needsrcrev = True + + # Perforce packages support SRCREV = "${AUTOREV}" + elif uri.scheme == "p4": + needsrcrev = True + + elif uri.scheme == "repo": + needsrcrev = True + + if needsrcrev: + d.setVar("SRCPV", "${@bb.fetch2.get_srcrev(d)}") + for e in d.keys(): flags = d.getVarFlags(e) if flags and flags.get('task'): diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f421050..124bf49 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -36,6 +36,10 @@ PR = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[2] or 'r0'}" PROVIDES = "" S = "${WORKDIR}/${P}" AUTOREV = "${@bb.fetch2.get_autorev(d)}" +AUTOREV[vardepvalue] = "${SRCPV}" +# Set Dynamically in base.bbclass +# SRCPV = "${@bb.fetch2.get_srcrev(d)}" +SRCPV[vardepvalue] = "${SRCPV}" SRC_URI = "" STAMPS_DIR ?= "${TMPDIR}/stamps" STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}"