From patchwork Mon Feb 21 18:43:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5213 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4K2WRS1ygrz3wtM for ; Mon, 21 Feb 2022 18:44:04 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4K2WQz0zt4z5Xt; Mon, 21 Feb 2022 18:43:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4K2WQy2s4pz32MR; Mon, 21 Feb 2022 18:43: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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4K2WQs11qbz2ytv for ; Mon, 21 Feb 2022 18:43:33 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4K2WQq4Mw9z3Z5; Mon, 21 Feb 2022 18:43:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1645469011; 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=2cI5WAmcFpihWwUq4q+VW0BRdBaxrzo4RfOxTdd9vJs=; b=Za79EEIqbUAoM22ZEgrV1uIzPK8wHsz0Ax12/cy6qD39deQRDFdLR2KLelLsgqcve/ush0 3EB4K/m67Es+ldtrFloHylGqMLD81hkivC5QlpqqoZwm6vfhCJ5qqDJJ2eweR4UJLQ+kgZ XuRJytxjCZ8aPNmrXNl7jDJOhFn1vM16vMMtqyFfdMhTTwJHfT56as/BYlQd7wwUPAmDXV iEhW2+0nsZutaVxV/+4LUmtdCn5xzUDY+EiKh/23FKtfM+xghP72NiwmEkHCcsSu4Zoj8h 6VUheigbgkuhX0Gos3WBWwVbCRB2sZ3HSi+mddvAmNS74x0cwzpRfSdigaoHFQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1645469011; 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=2cI5WAmcFpihWwUq4q+VW0BRdBaxrzo4RfOxTdd9vJs=; b=QLOqKTvP67jJFUwSbhS5IU7wfXDeQqhdeOvGzBE7v/NM5Gif1t2pFWbzQSKcpNc5QOGqrr 8ve/AjWsJgU64xCw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 25/27] python3-terminaltables: New package Date: Mon, 21 Feb 2022 18:43:16 +0000 Message-Id: <20220221184318.1158749-25-michael.tremer@ipfire.org> In-Reply-To: <20220221184318.1158749-1-michael.tremer@ipfire.org> References: <20220221184318.1158749-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Required by oci-cli. Signed-off-by: Michael Tremer --- .../rootfiles/packages/python3-terminaltables | 14 ++++ lfs/oci-cli | 2 +- lfs/python3-terminaltables | 81 +++++++++++++++++++ make.sh | 1 + 4 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/packages/python3-terminaltables create mode 100644 lfs/python3-terminaltables diff --git a/config/rootfiles/packages/python3-terminaltables b/config/rootfiles/packages/python3-terminaltables new file mode 100644 index 000000000..3bbd956a0 --- /dev/null +++ b/config/rootfiles/packages/python3-terminaltables @@ -0,0 +1,14 @@ +usr/lib/python3.10/site-packages/terminaltables +#usr/lib/python3.10/site-packages/terminaltables-3.1.10-py3.10.egg-info +#usr/lib/python3.10/site-packages/terminaltables-3.1.10-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/terminaltables-3.1.10-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/terminaltables-3.1.10-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/terminaltables-3.1.10-py3.10.egg-info/top_level.txt +usr/lib/python3.10/site-packages/terminaltables/__init__.py +usr/lib/python3.10/site-packages/terminaltables/ascii_table.py +usr/lib/python3.10/site-packages/terminaltables/base_table.py +usr/lib/python3.10/site-packages/terminaltables/build.py +usr/lib/python3.10/site-packages/terminaltables/github_table.py +usr/lib/python3.10/site-packages/terminaltables/other_tables.py +usr/lib/python3.10/site-packages/terminaltables/terminal_io.py +usr/lib/python3.10/site-packages/terminaltables/width_and_alignment.py diff --git a/lfs/oci-cli b/lfs/oci-cli index 8371f604e..a275b3f08 100644 --- a/lfs/oci-cli +++ b/lfs/oci-cli @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = oci-cli PAK_VER = 1 -DEPS = oci-python-sdk python3-arrow python3-six +DEPS = oci-python-sdk python3-arrow python3-six python3-terminaltables ############################################################################### # Top-level Rules diff --git a/lfs/python3-terminaltables b/lfs/python3-terminaltables new file mode 100644 index 000000000..d06b10688 --- /dev/null +++ b/lfs/python3-terminaltables @@ -0,0 +1,81 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 = 3.1.10 + +THISAPP = terminaltables-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python3-terminaltables +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 5467e06a1a6e24dc44e6dd241706668e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# 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 bbb0ffaae..8b968137e 100755 --- a/make.sh +++ b/make.sh @@ -1641,6 +1641,7 @@ buildipfire() { lfsmake2 python3-pytz lfsmake2 python3-click lfsmake2 python3-arrow + lfsmake2 python3-terminaltables lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli