From patchwork Mon Jan 29 13:41:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7499 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 4TNqG9276xz3xHD for ; Mon, 29 Jan 2024 13:41:37 +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 4TNqG53Yd8z1mH; Mon, 29 Jan 2024 13:41:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TNqG530Lyz32hB; Mon, 29 Jan 2024 13:41:33 +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 4TNqFy605Wz30S9 for ; Mon, 29 Jan 2024 13:41:26 +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 4TNqFy4XTKzj5; Mon, 29 Jan 2024 13:41:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1706535686; 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=bFyX7QLfdOOSd8SyT8EAuvv4fmak1RPNUqMfZlf68tM=; b=SGtpXEIab0BmGFUlX6YmeyL15HAcW2MmSTKn9jZURnQ8QW/zXO27aEticvrpOBXg0pj/fX QYscm7cwqCcyWqBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1706535686; 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=bFyX7QLfdOOSd8SyT8EAuvv4fmak1RPNUqMfZlf68tM=; b=CgmFd/PSI1DQdsmWeM/5SbAMfIey+FcYBzwqXpqYuwbUs+Qltdq9k/80AlQFuQSXlm0gs0 c4DSOGJEANo8IdrnlC72EwQBaRm7uW5/egQvrevPAYCKnRNXX7eRArP2bo8PyoQaU7Lloa qRrGGClihfnvBQxUWIpvEOrS1eo+9P/+6l38xBaoBiy7WmzEEUFdRSOZOySqiZYnwOpjqN MMdLv0Qb+vXbM8bXJy8XvsoFlIY0BmrGJYoFQaM9z5+Ogz7OMSTO0Nxlv47awT5CEpEsmF IQ6upa/Zdl2+vGhqLjXTyoZmyOttRJGNzE2ertXwP4y+RqtNPfjWycQ7eVYM7A== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 04/15] python3-hatch-vcs: New build dependency for python3-attrs Date: Mon, 29 Jan 2024 14:41:09 +0100 Message-ID: <20240129134120.3269534-4-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: E4SDYXY62BFTEBFVJQREKANJB4YJH25V X-Message-ID-Hash: E4SDYXY62BFTEBFVJQREKANJB4YJH25V 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 pyproject.toml build approach Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/common/python3-hatch-vcs | 18 +++++ lfs/python3-hatch-vcs | 85 +++++++++++++++++++++++ make.sh | 1 + 3 files changed, 104 insertions(+) create mode 100644 config/rootfiles/common/python3-hatch-vcs create mode 100644 lfs/python3-hatch-vcs diff --git a/config/rootfiles/common/python3-hatch-vcs b/config/rootfiles/common/python3-hatch-vcs new file mode 100644 index 000000000..5a3434c84 --- /dev/null +++ b/config/rootfiles/common/python3-hatch-vcs @@ -0,0 +1,18 @@ +#usr/lib/python3.10/site-packages/hatch_vcs +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/INSTALLER +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/METADATA +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/RECORD +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/REQUESTED +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/WHEEL +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/direct_url.json +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/entry_points.txt +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/licenses +#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/licenses/LICENSE.txt +#usr/lib/python3.10/site-packages/hatch_vcs/__about__.py +#usr/lib/python3.10/site-packages/hatch_vcs/__init__.py +#usr/lib/python3.10/site-packages/hatch_vcs/build_hook.py +#usr/lib/python3.10/site-packages/hatch_vcs/hooks.py +#usr/lib/python3.10/site-packages/hatch_vcs/metadata_hook.py +#usr/lib/python3.10/site-packages/hatch_vcs/vcs_utils.py +#usr/lib/python3.10/site-packages/hatch_vcs/version_source.py diff --git a/lfs/python3-hatch-vcs b/lfs/python3-hatch-vcs new file mode 100644 index 000000000..8e9c3c5d1 --- /dev/null +++ b/lfs/python3-hatch-vcs @@ -0,0 +1,85 @@ +############################################################################### +# # +# 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 = 0.4.0 + +THISAPP = hatch_vcs-$(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 = cc0e02cbedf968a630803791b455f22f2ce60966327a531aac87196d48f6cf192f74eab6e995a169659983b6049cb2e656ca3d7f3670445ef06eca65318c5c6a + +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 -m build \ + --no-isolation \ + --wheel + cd $(DIR_APP) && pip3 install \ + --no-build-isolation \ + --root="/" \ + --no-deps \ + --ignore-installed \ + dist/*.whl + # remove temp build files in /root/.cache from rootfile + cd $(DIR_APP) && rm -R /root/.cache/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d77ad1099..571903442 100755 --- a/make.sh +++ b/make.sh @@ -1596,6 +1596,7 @@ buildipfire() { lfsmake2 python3-pkgconfig lfsmake2 python3-msgpack lfsmake2 python3-hatchling + lfsmake2 python3-hatch-vcs lfsmake2 python3-attrs lfsmake2 python3-sniffio lfsmake2 python3-sortedcontainers