From patchwork Mon Jan 29 13:41:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7503 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4TNqGG1T9wz3xHD for ; Mon, 29 Jan 2024 13:41:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4TNqGF5cP9z7Mf; Mon, 29 Jan 2024 13:41:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TNqGF4zwGz32hH; Mon, 29 Jan 2024 13:41:41 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4TNqFz4xPVz32gt for ; Mon, 29 Jan 2024 13:41:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4TNqFz3RZwzj5; Mon, 29 Jan 2024 13:41:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1706535687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qhzOuicref8aGDuClIe9O/kRV0pAgp/Z1SiZhCOaOVE=; b=zqUvcu4rcD5+fym2v3fql5GM+Mi9JQh9R/VtlMrx101OCxLjQ0xBjbnGyxTCAgLUJ+Veno lwNsKbn9+ytF3pCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1706535687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qhzOuicref8aGDuClIe9O/kRV0pAgp/Z1SiZhCOaOVE=; b=GdcPsXm5XwAGhVzhPhn3QP78Y499itJjZPnLkNidwBrGIqn2tM1DvXWWtR9ar2vT0wdXGk xpi0NtJDsrdseT+phDiMcg3fw05C3Op80mAGxWHek3yvAn/xgKipZlfkpqZqQJce/pq5Ud X/MwUslpZnBix+D70gaEeteDAcxkcyc6UVdUW/CaIodW4TmXq5xCzG1k35dn1iX7VZJqH6 nqkZ4zIhKQAaq39QZd95jjq28fr4jgEUO6Z7uwbQ0Bto1w76CZewRTzvi6RP/EOMLWu6Nb 66cHPVXOr8+sBeGHUGlUSGxxS2Gvy0F9D5V8v7aLN4tKv9neQi9LG/jRThppZQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 08/15] python3-pluggy: New build dependency for python3-hatchling Date: Mon, 29 Jan 2024 14:41:13 +0100 Message-ID: <20240129134120.3269534-8-adolf.belka@ipfire.org> In-Reply-To: <20240129134120.3269534-1-adolf.belka@ipfire.org> References: <20240129134120.3269534-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: RJIRIDSAQV4M5BW7Z75QUASKSXMYOSYT X-Message-ID-Hash: RJIRIDSAQV4M5BW7Z75QUASKSXMYOSYT X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - lfs and rootfile created. - rootfile put into common as it is only used as a build dependency. - Used setup.py build approach as pyproject.toml approach kept failing to build Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/common/python3-pluggy | 16 ++++++ lfs/python3-pluggy | 76 ++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 93 insertions(+) create mode 100644 config/rootfiles/common/python3-pluggy create mode 100644 lfs/python3-pluggy diff --git a/config/rootfiles/common/python3-pluggy b/config/rootfiles/common/python3-pluggy new file mode 100644 index 000000000..9df9610de --- /dev/null +++ b/config/rootfiles/common/python3-pluggy @@ -0,0 +1,16 @@ +#usr/lib/python3.10/site-packages/pluggy +#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info +#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/pluggy/__init__.py +#usr/lib/python3.10/site-packages/pluggy/_callers.py +#usr/lib/python3.10/site-packages/pluggy/_hooks.py +#usr/lib/python3.10/site-packages/pluggy/_manager.py +#usr/lib/python3.10/site-packages/pluggy/_result.py +#usr/lib/python3.10/site-packages/pluggy/_tracing.py +#usr/lib/python3.10/site-packages/pluggy/_version.py +#usr/lib/python3.10/site-packages/pluggy/_warnings.py +#usr/lib/python3.10/site-packages/pluggy/py.typed diff --git a/lfs/python3-pluggy b/lfs/python3-pluggy new file mode 100644 index 000000000..deb018ee4 --- /dev/null +++ b/lfs/python3-pluggy @@ -0,0 +1,76 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.4.0 + +THISAPP = pluggy-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 0a8bff68f1871f0e571105012b0e3961771c6ee34a64711520084d0a951308d192187d01b14136c389b5bc09f127ead1a1f96ebffa7b345d2d5023157c049c43 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python3 setup.py build + cd $(DIR_APP) && python3 setup.py install --root=/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 9b46c4f42..32234d844 100755 --- a/make.sh +++ b/make.sh @@ -1597,6 +1597,7 @@ buildipfire() { lfsmake2 python3-msgpack lfsmake2 python3-editables lfsmake2 python3-pathspec + lfsmake2 python3-pluggy lfsmake2 python3-hatchling lfsmake2 python3-hatch-vcs lfsmake2 python3-hatch-fancy-pypi-readme