From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 27 Sep 2024 13:39:45 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1su9K4-003O6A-1p for lore@lore.pengutronix.de; Fri, 27 Sep 2024 13:39:45 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1su9K5-00076H-8I; Fri, 27 Sep 2024 13:39:45 +0200 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1su9Ji-0006pv-3Y for ptxdist@pengutronix.de; Fri, 27 Sep 2024 13:39:22 +0200 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-5398a26b64fso389009e87.3 for ; Fri, 27 Sep 2024 04:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727437161; x=1728041961; darn=pengutronix.de; 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=mNy71jl/Pvepy1rK4qJYkyUd3AlVjSKbLvULlgFCoyQ=; b=PR9KbA7w19zV8yl6jY2FX20Ru5Dkk4YwkmJEorOTxJ9CudUlb61PnmaBualSAk8D0/ WxxGZ4+x7R1gfFT1HEnH8R3tB3y5CWeBrtl9RRRK8wpb5RPwHm1q2mxhmOGKpa4uUczf n2X59jnQYn1ABGvZPUQHDeWvZd6S9gfstbIhHA8zQaJFWfhwv5VB99lmsnj+Xp3MUjMq m2n+oxasWUHgeFBZADx38gZxGT60AAkEur9dyTjT2ygr9JU4yXrO/X3ID+tuTgIFCPFu QYyQU+dkq0WdDhaedZnzgsaggD0d9Ybnc5IE+rEM0Obnbt/gsuDEtt1ZnntYRho36qXu 7hxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727437161; x=1728041961; 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=mNy71jl/Pvepy1rK4qJYkyUd3AlVjSKbLvULlgFCoyQ=; b=TyAIWN+GPJWZEME1EZvbvpFnqfLF/lHKpjUnQXAdFwPOiNAAGdRCw6IvS9XMw01Atn BxWnGqwg9fEJDun5xdQslbsfvaW0p/pLaZHevfVC3jY7FcnowrqnIIvQHjxszgijv2pa h6VguBjhX7KexM4uJqs1eQK9KZRWt/CAPt3pdwbkzDliM2bKy1RG/PBKOdHyHhQ0h02E yhG+UwR3OKYGikVrbtynCyPRxDZav8pwrcjRw711mpNPddg/MOBmlZqyQVKQ3ih+hiUN 8KbSUM0TkGnOKiAqFJZx9uYUJYUIL+7WU9SAfjvtQE1CcP8cMrxtJzlNV7lzv6hejPCX +0Cg== X-Gm-Message-State: AOJu0YzisoYbAV+gxdWMfidB5o8MPPD10vBFNn0ydjwEPVfmMK8dCPug ip87CPg8YNa3I8W9AQLkVTItf7//N7Kv2GIYDlCTlhOQkcUy/egJzqDbGA== X-Google-Smtp-Source: AGHT+IGJIiQ0o08F6DOZj6RxGeQNkwFnG4fhWO9Ae5wkrpJbeUrvGqEORVA70QWqKd1oFgJxWic4vw== X-Received: by 2002:a05:6512:eaa:b0:536:54fd:275b with SMTP id 2adb3069b0e04-5389fc83fbbmr1676137e87.54.1727437160927; Fri, 27 Sep 2024 04:39:20 -0700 (PDT) Received: from laped.devtools.kamstrup.dk ([185.181.22.18]) by smtp.googlemail.com with ESMTPSA id 2adb3069b0e04-5389fd5e312sm275606e87.109.2024.09.27.04.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 04:39:20 -0700 (PDT) From: Lars Pedersen To: ptxdist@pengutronix.de Date: Fri, 27 Sep 2024 13:38:28 +0200 Message-ID: <20240927113830.415517-2-lapeddk@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240927113830.415517-1-lapeddk@gmail.com> References: <20240927113830.415517-1-lapeddk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 2/4] host-python3-setuptools-scm: Version bump 4.1.2 -> 8.1.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lars Pedersen Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Lars Pedersen --- rules/host-python3-setuptools-scm.make | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rules/host-python3-setuptools-scm.make b/rules/host-python3-setuptools-scm.make index f413d7b35..0146fa9cd 100644 --- a/rules/host-python3-setuptools-scm.make +++ b/rules/host-python3-setuptools-scm.make @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SETUPTOOLS_SCM) += host-python3-setuptools- # # Paths and names # -HOST_PYTHON3_SETUPTOOLS_SCM_VERSION := 4.1.2 -HOST_PYTHON3_SETUPTOOLS_SCM_MD5 := e6c9fad17c90516d640868eb833d5150 +HOST_PYTHON3_SETUPTOOLS_SCM_VERSION := 8.1.0 +HOST_PYTHON3_SETUPTOOLS_SCM_MD5 := d8046dce093a94dc382b68b45f6a6257 HOST_PYTHON3_SETUPTOOLS_SCM := setuptools_scm-$(HOST_PYTHON3_SETUPTOOLS_SCM_VERSION) HOST_PYTHON3_SETUPTOOLS_SCM_SUFFIX := tar.gz HOST_PYTHON3_SETUPTOOLS_SCM_URL := $(call ptx/mirror-pypi, setuptools_scm, $(HOST_PYTHON3_SETUPTOOLS_SCM).$(HOST_PYTHON3_SETUPTOOLS_SCM_SUFFIX)) @@ -29,4 +29,12 @@ HOST_PYTHON3_SETUPTOOLS_SCM_LICENSE := MIT HOST_PYTHON3_SETUPTOOLS_SCM_CONF_TOOL := python3 +# Patch in version by removing multiline dynamic = [ "version" ] (line 39 to 41) and add static version after project name +$(STATEDIR)/host-python3-setuptools-scm.extract.post: + @$(call targetinfo) + @$(call world/patchin/post, HOST_PYTHON3_SETUPTOOLS_SCM) + @sed -i '39,41d' $(HOST_PYTHON3_SETUPTOOLS_SCM_DIR)/pyproject.toml + @sed -i '/^name =/aversion = "$(HOST_PYTHON3_SETUPTOOLS_SCM_VERSION)"' $(HOST_PYTHON3_SETUPTOOLS_SCM_DIR)/pyproject.toml + @$(call touch) + # vim: syntax=make -- 2.46.1