From patchwork Fri Aug 25 10:41:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 29485 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 E3392C7EE2C for ; Fri, 25 Aug 2023 10:42:24 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web10.10638.1692960135631723690 for ; Fri, 25 Aug 2023 03:42:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=S9RxMfIn; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-9a1de3417acso385919566b.0 for ; Fri, 25 Aug 2023 03:42:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692960134; x=1693564934; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zVj720IdOlpD97OmR+sTH2XRuQ0KtEOZPAOiWE/eqCY=; b=S9RxMfInTh9f6LiAwHlS0gYuP4Tz0nGnGuxFHig1v0PXKtCAgQ1Z0xv2O/M4lX1M73 UcK4j68naWi15CLD3PSroPgOVRhVnypQuE55Y+ol2HchxiMXXx2csVvxB909bWbielak YuNckj2ix6aLVitJbghF8JmsFQQMxP28CWSZbU+n7J83b6bUTKZTcAE3HHjY9wMy11G+ W3cdN53tOW3vU2g++ZnfoexuBZtd01ryjU6AG+OvOXPNUOH8PnNGFimENUltNsp9YY6t vfU1fGZ1xnDmeUbwQ5kCMU0ApkZWN9yJi6MprBRAG9XbBW2Fri7KqS2P8C6pSeniw0kJ N3XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692960134; x=1693564934; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zVj720IdOlpD97OmR+sTH2XRuQ0KtEOZPAOiWE/eqCY=; b=I29n419EoFN6V0TLxcoqA5DzBBGYtyKmEMiL+Xk2v0bT+jue7g++XYcnXMIhw/vwT5 xU1ywZ67QYyDTitRpl5eK3FuHTPhJTueFYZKYWlES1+1/KSF9X7rvIgLq/PDBimdeYKi kRT+IOeRhRSwc/t7hmK4nmadUL6w/ng95VktqeQpR3afpwqfiDptvLnwV+L4/DHVEX8U 5DK4pv6/DvZTCW2xqRw1Ap+1Ya2JZsnenkZqGElCKDtFoTPZXAQdsocOnBzi2wDs+qOW SK2SfAHb32MrSw3G9oAobEmUmKQLixbHZlTrkX6ej72WTchT5bMtV1l10qPv+gTqe0aR n2ag== X-Gm-Message-State: AOJu0YwjQ+bTHvov6Y0vdbtnQJbUD80IfBonC1weeTQ/ZzxP98ksi0c6 ptwyRfbWB316Qwhy/XsF04NyhhedC1c= X-Google-Smtp-Source: AGHT+IFIPpYtC6thjbfkvEt8fbDxvKcCfd1TW6gyf/GZgaBW3PsCB53OXZZ7IxbLJdgsybH+VeeX5g== X-Received: by 2002:a17:907:7804:b0:9a1:914e:491a with SMTP id la4-20020a170907780400b009a1914e491amr16514329ejc.3.1692960133766; Fri, 25 Aug 2023 03:42:13 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q22-20020a170906361600b0099bd6026f45sm825219ejb.198.2023.08.25.03.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 03:42:13 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/2] lib/oe/recipeutils.py: accommodate SRCPV being optional and deprecated in version check regex Date: Fri, 25 Aug 2023 12:41:57 +0200 Message-Id: <20230825104158.3273715-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 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 ; Fri, 25 Aug 2023 10:42:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186703 Signed-off-by: Alexander Kanavin --- meta/lib/oe/recipeutils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 6996e426ec0..3336db8ab06 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -945,10 +945,9 @@ def replace_dir_vars(path, d): path = path.replace(dirpath, '${%s}' % dirvars[dirpath]) return path -def get_recipe_pv_without_srcpv(pv, uri_type): +def get_recipe_pv_with_pfx_sfx(pv, uri_type): """ - Get PV without SRCPV common in SCM's for now only - support git. + Get PV separating prefix and suffix components. Returns tuple with pv, prefix and suffix. """ @@ -956,7 +955,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type): sfx = '' if uri_type == 'git': - git_regex = re.compile(r"(?Pv?)(?P.*?)(?P\+[^\+]*(git)?r?(AUTOINC\+))(?P.*)") + git_regex = re.compile(r"(?Pv?)(?P.*?)(?P\+[^\+]*(git)?r?(AUTOINC\+)?)(?P.*)") m = git_regex.match(pv) if m: @@ -1008,7 +1007,7 @@ def get_recipe_upstream_version(rd): src_uri = src_uris.split()[0] uri_type, _, _, _, _, _ = decodeurl(src_uri) - (pv, pfx, sfx) = get_recipe_pv_without_srcpv(rd.getVar('PV'), uri_type) + (pv, pfx, sfx) = get_recipe_pv_with_pfx_sfx(rd.getVar('PV'), uri_type) ru['current_version'] = pv manual_upstream_version = rd.getVar("RECIPE_UPSTREAM_VERSION") From patchwork Fri Aug 25 10:41:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 29484 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 E25ADC71133 for ; Fri, 25 Aug 2023 10:42:24 +0000 (UTC) Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by mx.groups.io with SMTP id smtpd.web11.10616.1692960136144675694 for ; Fri, 25 Aug 2023 03:42:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ODTZiseR; spf=pass (domain: gmail.com, ip: 209.85.208.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-51a52a7d859so3796311a12.0 for ; Fri, 25 Aug 2023 03:42:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692960134; x=1693564934; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oP/K7KtDsHDxbfwl4a9xVKDWWF8byJMNX1LAjt4zC24=; b=ODTZiseRhEUC8v0vt4O1D/6gApMsH+9NjzXw2+TSDcUM9GPd4eWoxacp0AVjW1v/m/ 86ZzQ8S8S/7Ixz4Xcs9Kt/tj6d/fANgf/WxjQi/OfbQsGrxpf7iWoYFsgkyEbQLKiE0u /ESp4syUVV/gelf4dWUEAuFzXWxXRscUVz5uVN8+NNcqreUhHoKXzJWjm9QaZGX7ujuw OtfYa/CQXvOXg4q2F+ZNrvkz33bhqmfuLici8CwyPUB8Gl6TCvMG8QFIgyddpzXVC4Xe y4sgOy0mo/EeaoYvnT35QS3HtQK54oE2ToDvvwIxSwpTCI+wb4SP7X/Tqrqgqb+Ck1ac /AFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692960134; x=1693564934; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oP/K7KtDsHDxbfwl4a9xVKDWWF8byJMNX1LAjt4zC24=; b=bPJsHofasjp1VIsVFcl3aG4Ijl7P4Yq0V7wt8S/E3pfEvv0IDbI6s3W11420COv9BM oTcEdltK1dWhzLayTzJQGNGeSyzH/Vy4GmdlnLlfNj4/H7B/0VeJu1KLRgthv6L88gyL 7+53+KEz5dxWpsh4NvDVthDAH0gndyDPglC/lHQvUvM0mpRdMjX5ifAa1Paxs0vZOkB6 7NRUEZJjNnRx26SouwWkiEqDvZVyN8J1O70WwfUppDAvPvNeDHJfFkvaXVCzdghYwbSb abClCe/w064hGYsB4ouYeUC2UZk2/b4LzAwogv2nUH8yAtdAce20hMGCelPyUM0PxsNt n3Yg== X-Gm-Message-State: AOJu0Yz+1Gugj8sa+YYP1OVc1Xi8Tj/a4GuLYe3AZuFZ6vY5itu2D9mB SSI4ZFntQ1llKZuVb6/ftx/tnsRkz74= X-Google-Smtp-Source: AGHT+IHCgufgThTCNwBmI6dO+r1C1dy4VI70512Ll+KczavRJ1snSHL91vvljClyDw2h7avnVJ2UlA== X-Received: by 2002:a17:907:7da3:b0:982:a022:a540 with SMTP id oz35-20020a1709077da300b00982a022a540mr19623003ejc.11.1692960134369; Fri, 25 Aug 2023 03:42:14 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id q22-20020a170906361600b0099bd6026f45sm825219ejb.198.2023.08.25.03.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 03:42:14 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/2] python3-sphinx: correct version check Date: Fri, 25 Aug 2023 12:41:58 +0200 Message-Id: <20230825104158.3273715-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230825104158.3273715-1-alex@linutronix.de> References: <20230825104158.3273715-1-alex@linutronix.de> MIME-Version: 1.0 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 ; Fri, 25 Aug 2023 10:42:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186704 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/python/python3-sphinx_7.1.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3-sphinx_7.1.1.bb b/meta/recipes-devtools/python/python3-sphinx_7.1.1.bb index fa616cd5044..92d60126922 100644 --- a/meta/recipes-devtools/python/python3-sphinx_7.1.1.bb +++ b/meta/recipes-devtools/python/python3-sphinx_7.1.1.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb6ac1b115a1ed24a12d9f15b633993" SRC_URI[sha256sum] = "59b8e391f0768a96cd233e8300fe7f0a8dc2f64f83dc2a54336a9a84f428ff4e" inherit python_flit_core pypi +UPSTREAM_CHECK_REGEX = "/Sphinx/(?P(\d+[\.\-_]*)+)/" do_install:append () { # The cache format of "{None, 'en', 'ja'}" doesn't seem to be consistent (dict ordering?)