| Message ID | 20240129134120.3269534-6-adolf.belka@ipfire.org |
|---|---|
| State | Staged |
| Commit | ec01213dcf0c8283626aa9d5a7fbc30ac725ae8c |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 4TNqGC4dHyz3xHD for <patchwork@web04.haj.ipfire.org>; Mon, 29 Jan 2024 13:41:39 +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 4TNqGB182bz2n9; Mon, 29 Jan 2024 13:41:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TNqGB0Vqjz30Ht; Mon, 29 Jan 2024 13:41:38 +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 4TNqFz1wfTz32gt for <development@lists.ipfire.org>; 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 4TNqFz0Sktzj5; 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=EqbAKG2Iu1um4jslRob0eKLRqskxQlpA7GT4pPzgZ5k=; b=s5t6PtQrsu2AGCWb4g/E+ZKu6rLraRJBA2ZguoMexJ0x+bEzNz1jbbblMHBCkvv1Tu4zLR coKezGHmWb1oQCAw== 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=EqbAKG2Iu1um4jslRob0eKLRqskxQlpA7GT4pPzgZ5k=; b=RBkJ16fysJnNrzPWH8diqh7F2L8ZOrnxb3wFDBKqjKx1cidVOXQu/vwlvCoxt4P1PaV88v zaIxSvTdcHGuEqZKwEY7KJt2vbLUFPva4gb+s5I7DKx4Uv+vJiQslPVbNoOPrjztNURsiY w9DmOE8iQdFw1d5CnipDIFYgUM+UDRfjUljZsOxKQWp+tCR4B95X7Vit0Rhr4zyRWTZOw/ wUNPaL7MtXjuj6KNlL2VuFbj40wvVwDRZw7qDHCtys+pZ1jTy2U6SpjWwR+uhAufpm+w5F Ah/CqRKKdNFhUIVO+50q0PV099MMxU/cIXRIIN7al2boQ90NY+sOL+ghj2SKbg== From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 06/15] python3-editables: New build dependency for python3-hatchling Date: Mon, 29 Jan 2024 14:41:11 +0100 Message-ID: <20240129134120.3269534-6-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 Content-Transfer-Encoding: 8bit Message-ID-Hash: CJJXXQYL7ICFQPIXHCKMFFEARHXHWBNW X-Message-ID-Hash: CJJXXQYL7ICFQPIXHCKMFFEARHXHWBNW 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 <development.lists.ipfire.org> Archived-At: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/CJJXXQYL7ICFQPIXHCKMFFEARHXHWBNW/> List-Archive: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Owner: <mailto:development-owner@lists.ipfire.org> List-Post: <mailto:development@lists.ipfire.org> List-Subscribe: <mailto:development-join@lists.ipfire.org> List-Unsubscribe: <mailto:development-leave@lists.ipfire.org> |
| Series |
[01/15] borgbackup: Update to version 1.2.7
|
|
Commit Message
Adolf Belka
Jan. 29, 2024, 1:41 p.m. UTC
- 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 <adolf.belka@ipfire.org> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> --- config/rootfiles/common/python3-editables | 12 ++++ lfs/python3-editables | 85 +++++++++++++++++++++++ make.sh | 4 +- 3 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 config/rootfiles/common/python3-editables create mode 100644 lfs/python3-editables
Comments
Hi, this reverts changes for frr deps (protobuf) on make.sh Arne Am 2024-01-29 14:41, schrieb Adolf Belka: > - 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 <adolf.belka@ipfire.org> > Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> > --- > config/rootfiles/common/python3-editables | 12 ++++ > lfs/python3-editables | 85 +++++++++++++++++++++++ > make.sh | 4 +- > 3 files changed, 98 insertions(+), 3 deletions(-) > create mode 100644 config/rootfiles/common/python3-editables > create mode 100644 lfs/python3-editables > > diff --git a/config/rootfiles/common/python3-editables > b/config/rootfiles/common/python3-editables > new file mode 100644 > index 000000000..6b5b36e52 > --- /dev/null > +++ b/config/rootfiles/common/python3-editables > @@ -0,0 +1,12 @@ > +#usr/lib/python3.10/site-packages/editables > +#usr/lib/python3.10/site-packages/editables-0.5.dist-info > +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER > +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt > +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA > +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD > +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED > +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL > +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json > +#usr/lib/python3.10/site-packages/editables/__init__.py > +#usr/lib/python3.10/site-packages/editables/py.typed > +#usr/lib/python3.10/site-packages/editables/redirector.py > diff --git a/lfs/python3-editables b/lfs/python3-editables > new file mode 100644 > index 000000000..cb5b33d45 > --- /dev/null > +++ b/lfs/python3-editables > @@ -0,0 +1,85 @@ > +############################################################################### > +# > # > +# IPFire.org - A linux based firewall > # > +# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> > # > +# > # > +# 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 > <http://www.gnu.org/licenses/>. # > +# > # > +############################################################################### > + > +############################################################################### > +# Definitions > +############################################################################### > + > +include Config > + > +VER = 0.5 > + > +THISAPP = editables-$(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 = > 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1 > + > +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 d914a76e0..1466574d0 100755 > --- a/make.sh > +++ b/make.sh > @@ -1595,6 +1595,7 @@ buildipfire() { > lfsmake2 python3-terminaltables > lfsmake2 python3-pkgconfig > lfsmake2 python3-msgpack > + lfsmake2 python3-editables > lfsmake2 python3-hatchling > lfsmake2 python3-hatch-vcs > lfsmake2 python3-hatch-fancy-pypi-readme > @@ -1651,9 +1652,6 @@ buildipfire() { > lfsmake2 dnsdist > lfsmake2 bird > lfsmake2 libyang > - lfsmake2 abseil-cpp > - lfsmake2 protobuf > - lfsmake2 protobuf-c > lfsmake2 frr > lfsmake2 dmidecode > lfsmake2 mcelog
Oops. I just corrected this. -Michael > On 30 Jan 2024, at 14:11, Arne Fitzenreiter <arne_f@ipfire.org> wrote: > > Hi, > > this reverts changes for frr deps (protobuf) on make.sh > > Arne > > Am 2024-01-29 14:41, schrieb Adolf Belka: >> - 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 <adolf.belka@ipfire.org> >> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >> --- >> config/rootfiles/common/python3-editables | 12 ++++ >> lfs/python3-editables | 85 +++++++++++++++++++++++ >> make.sh | 4 +- >> 3 files changed, 98 insertions(+), 3 deletions(-) >> create mode 100644 config/rootfiles/common/python3-editables >> create mode 100644 lfs/python3-editables >> diff --git a/config/rootfiles/common/python3-editables b/config/rootfiles/common/python3-editables >> new file mode 100644 >> index 000000000..6b5b36e52 >> --- /dev/null >> +++ b/config/rootfiles/common/python3-editables >> @@ -0,0 +1,12 @@ >> +#usr/lib/python3.10/site-packages/editables >> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info >> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER >> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt >> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA >> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD >> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED >> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL >> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json >> +#usr/lib/python3.10/site-packages/editables/__init__.py >> +#usr/lib/python3.10/site-packages/editables/py.typed >> +#usr/lib/python3.10/site-packages/editables/redirector.py >> diff --git a/lfs/python3-editables b/lfs/python3-editables >> new file mode 100644 >> index 000000000..cb5b33d45 >> --- /dev/null >> +++ b/lfs/python3-editables >> @@ -0,0 +1,85 @@ >> +############################################################################### >> +# # >> +# IPFire.org - A linux based firewall # >> +# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> # >> +# # >> +# 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 <http://www.gnu.org/licenses/>. # >> +# # >> +############################################################################### >> + >> +############################################################################### >> +# Definitions >> +############################################################################### >> + >> +include Config >> + >> +VER = 0.5 >> + >> +THISAPP = editables-$(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 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1 >> + >> +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 d914a76e0..1466574d0 100755 >> --- a/make.sh >> +++ b/make.sh >> @@ -1595,6 +1595,7 @@ buildipfire() { >> lfsmake2 python3-terminaltables >> lfsmake2 python3-pkgconfig >> lfsmake2 python3-msgpack >> + lfsmake2 python3-editables >> lfsmake2 python3-hatchling >> lfsmake2 python3-hatch-vcs >> lfsmake2 python3-hatch-fancy-pypi-readme >> @@ -1651,9 +1652,6 @@ buildipfire() { >> lfsmake2 dnsdist >> lfsmake2 bird >> lfsmake2 libyang >> - lfsmake2 abseil-cpp >> - lfsmake2 protobuf >> - lfsmake2 protobuf-c >> lfsmake2 frr >> lfsmake2 dmidecode >> lfsmake2 mcelog
Hi All, Yes that was me. I know what happened now. The borgbackup update set was becoming so large that at a certain point I stashed it and worked on something else. Then I came back to it and continued working on it. However I also did a git pull on my ipfire local repo so I got the newer make.sh file. I did actually spot it when I was doing the commits for the borgbackup set and I thought I had done the correction on all the make.sh versions for the new files but I obviously missed the python3-editables set. Thanks for catching it for me. Moral of the story, don't do a git pull when you have a partially done patch set update :-) Regards, Adolf. On 30/01/2024 15:57, Michael Tremer wrote: > Oops. I just corrected this. > > -Michael > >> On 30 Jan 2024, at 14:11, Arne Fitzenreiter <arne_f@ipfire.org> wrote: >> >> Hi, >> >> this reverts changes for frr deps (protobuf) on make.sh >> >> Arne >> >> Am 2024-01-29 14:41, schrieb Adolf Belka: >>> - 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 <adolf.belka@ipfire.org> >>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >>> --- >>> config/rootfiles/common/python3-editables | 12 ++++ >>> lfs/python3-editables | 85 +++++++++++++++++++++++ >>> make.sh | 4 +- >>> 3 files changed, 98 insertions(+), 3 deletions(-) >>> create mode 100644 config/rootfiles/common/python3-editables >>> create mode 100644 lfs/python3-editables >>> diff --git a/config/rootfiles/common/python3-editables b/config/rootfiles/common/python3-editables >>> new file mode 100644 >>> index 000000000..6b5b36e52 >>> --- /dev/null >>> +++ b/config/rootfiles/common/python3-editables >>> @@ -0,0 +1,12 @@ >>> +#usr/lib/python3.10/site-packages/editables >>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info >>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER >>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt >>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA >>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD >>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED >>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL >>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json >>> +#usr/lib/python3.10/site-packages/editables/__init__.py >>> +#usr/lib/python3.10/site-packages/editables/py.typed >>> +#usr/lib/python3.10/site-packages/editables/redirector.py >>> diff --git a/lfs/python3-editables b/lfs/python3-editables >>> new file mode 100644 >>> index 000000000..cb5b33d45 >>> --- /dev/null >>> +++ b/lfs/python3-editables >>> @@ -0,0 +1,85 @@ >>> +############################################################################### >>> +# # >>> +# IPFire.org - A linux based firewall # >>> +# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> # >>> +# # >>> +# 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 <http://www.gnu.org/licenses/>. # >>> +# # >>> +############################################################################### >>> + >>> +############################################################################### >>> +# Definitions >>> +############################################################################### >>> + >>> +include Config >>> + >>> +VER = 0.5 >>> + >>> +THISAPP = editables-$(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 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1 >>> + >>> +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 d914a76e0..1466574d0 100755 >>> --- a/make.sh >>> +++ b/make.sh >>> @@ -1595,6 +1595,7 @@ buildipfire() { >>> lfsmake2 python3-terminaltables >>> lfsmake2 python3-pkgconfig >>> lfsmake2 python3-msgpack >>> + lfsmake2 python3-editables >>> lfsmake2 python3-hatchling >>> lfsmake2 python3-hatch-vcs >>> lfsmake2 python3-hatch-fancy-pypi-readme >>> @@ -1651,9 +1652,6 @@ buildipfire() { >>> lfsmake2 dnsdist >>> lfsmake2 bird >>> lfsmake2 libyang >>> - lfsmake2 abseil-cpp >>> - lfsmake2 protobuf >>> - lfsmake2 protobuf-c >>> lfsmake2 frr >>> lfsmake2 dmidecode >>> lfsmake2 mcelog >
Happens :) It was just three lines that confused me quite a bit :) > On 30 Jan 2024, at 16:20, Adolf Belka <adolf.belka@ipfire.org> wrote: > > Hi All, > > Yes that was me. I know what happened now. > > The borgbackup update set was becoming so large that at a certain point I stashed it and worked on something else. Then I came back to it and continued working on it. > > However I also did a git pull on my ipfire local repo so I got the newer make.sh file. > > I did actually spot it when I was doing the commits for the borgbackup set and I thought I had done the correction on all the make.sh versions for the new files but I obviously missed the python3-editables set. > > Thanks for catching it for me. > > Moral of the story, don't do a git pull when you have a partially done patch set update :-) > > Regards, > Adolf. > > > On 30/01/2024 15:57, Michael Tremer wrote: >> Oops. I just corrected this. >> -Michael >>> On 30 Jan 2024, at 14:11, Arne Fitzenreiter <arne_f@ipfire.org> wrote: >>> >>> Hi, >>> >>> this reverts changes for frr deps (protobuf) on make.sh >>> >>> Arne >>> >>> Am 2024-01-29 14:41, schrieb Adolf Belka: >>>> - 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 <adolf.belka@ipfire.org> >>>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >>>> --- >>>> config/rootfiles/common/python3-editables | 12 ++++ >>>> lfs/python3-editables | 85 +++++++++++++++++++++++ >>>> make.sh | 4 +- >>>> 3 files changed, 98 insertions(+), 3 deletions(-) >>>> create mode 100644 config/rootfiles/common/python3-editables >>>> create mode 100644 lfs/python3-editables >>>> diff --git a/config/rootfiles/common/python3-editables b/config/rootfiles/common/python3-editables >>>> new file mode 100644 >>>> index 000000000..6b5b36e52 >>>> --- /dev/null >>>> +++ b/config/rootfiles/common/python3-editables >>>> @@ -0,0 +1,12 @@ >>>> +#usr/lib/python3.10/site-packages/editables >>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info >>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER >>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt >>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA >>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD >>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED >>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL >>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json >>>> +#usr/lib/python3.10/site-packages/editables/__init__.py >>>> +#usr/lib/python3.10/site-packages/editables/py.typed >>>> +#usr/lib/python3.10/site-packages/editables/redirector.py >>>> diff --git a/lfs/python3-editables b/lfs/python3-editables >>>> new file mode 100644 >>>> index 000000000..cb5b33d45 >>>> --- /dev/null >>>> +++ b/lfs/python3-editables >>>> @@ -0,0 +1,85 @@ >>>> +############################################################################### >>>> +# # >>>> +# IPFire.org - A linux based firewall # >>>> +# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> # >>>> +# # >>>> +# 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 <http://www.gnu.org/licenses/>. # >>>> +# # >>>> +############################################################################### >>>> + >>>> +############################################################################### >>>> +# Definitions >>>> +############################################################################### >>>> + >>>> +include Config >>>> + >>>> +VER = 0.5 >>>> + >>>> +THISAPP = editables-$(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 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1 >>>> + >>>> +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 d914a76e0..1466574d0 100755 >>>> --- a/make.sh >>>> +++ b/make.sh >>>> @@ -1595,6 +1595,7 @@ buildipfire() { >>>> lfsmake2 python3-terminaltables >>>> lfsmake2 python3-pkgconfig >>>> lfsmake2 python3-msgpack >>>> + lfsmake2 python3-editables >>>> lfsmake2 python3-hatchling >>>> lfsmake2 python3-hatch-vcs >>>> lfsmake2 python3-hatch-fancy-pypi-readme >>>> @@ -1651,9 +1652,6 @@ buildipfire() { >>>> lfsmake2 dnsdist >>>> lfsmake2 bird >>>> lfsmake2 libyang >>>> - lfsmake2 abseil-cpp >>>> - lfsmake2 protobuf >>>> - lfsmake2 protobuf-c >>>> lfsmake2 frr >>>> lfsmake2 dmidecode >>>> lfsmake2 mcelog
diff --git a/config/rootfiles/common/python3-editables b/config/rootfiles/common/python3-editables new file mode 100644 index 000000000..6b5b36e52 --- /dev/null +++ b/config/rootfiles/common/python3-editables @@ -0,0 +1,12 @@ +#usr/lib/python3.10/site-packages/editables +#usr/lib/python3.10/site-packages/editables-0.5.dist-info +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json +#usr/lib/python3.10/site-packages/editables/__init__.py +#usr/lib/python3.10/site-packages/editables/py.typed +#usr/lib/python3.10/site-packages/editables/redirector.py diff --git a/lfs/python3-editables b/lfs/python3-editables new file mode 100644 index 000000000..cb5b33d45 --- /dev/null +++ b/lfs/python3-editables @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> # +# # +# 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 <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.5 + +THISAPP = editables-$(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 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1 + +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 d914a76e0..1466574d0 100755 --- a/make.sh +++ b/make.sh @@ -1595,6 +1595,7 @@ buildipfire() { lfsmake2 python3-terminaltables lfsmake2 python3-pkgconfig lfsmake2 python3-msgpack + lfsmake2 python3-editables lfsmake2 python3-hatchling lfsmake2 python3-hatch-vcs lfsmake2 python3-hatch-fancy-pypi-readme @@ -1651,9 +1652,6 @@ buildipfire() { lfsmake2 dnsdist lfsmake2 bird lfsmake2 libyang - lfsmake2 abseil-cpp - lfsmake2 protobuf - lfsmake2 protobuf-c lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog