From patchwork Thu Aug 5 21:01:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4608 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 4Gggzr2WQ2z3xGN for ; Thu, 5 Aug 2021 21:02:48 +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 4Gggzr0C23z6cs; Thu, 5 Aug 2021 21:02:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Gggzq6gLlz2y2L; Thu, 5 Aug 2021 21:02:47 +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 4Gggzp4nyYz2xF1 for ; Thu, 5 Aug 2021 21:02:46 +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 4Gggzp0sVDzBV; Thu, 5 Aug 2021 21:02:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1628197366; 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=9eV1AA0nOPd9wW77IYyntSKCg82b69G2eN7dzKPTvF4=; b=gNV6VZR25IhZkEarXqyFZPdqzo6/l4BacwKfY7ZjyLMKNMftL2kTy4gBiwDU8K8lMLdfIW PPgOXj/ote9oTXDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1628197366; 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=9eV1AA0nOPd9wW77IYyntSKCg82b69G2eN7dzKPTvF4=; b=KU1Ay6V/HiG1slwaA7Liwpl8xN6hXrYFHAevpIydKf4hbOKf1K/jVLhKQ7OxijoiYd7CFh RvbROau6Zr4M/89QiBG4k9A7kqvUq+6Uc4VvC33XVRSbd69K1nOuhb+qANGX0kcEeCTt1P jDETG0ZmnjUAbpPMMx2Co25fiu9A7SiemattBZLCKSJ2LTL8cbqpa+2/yEP3pebCYzxHMm rbUGNz9FzTprgPAV9D4i3/Wrk75XKDzIQFU9Ruc24cYl+vtAA1Y69ndF6RL27u/e+/MdIE HqSCScRXYdkvzDGqbsmNhDjlm+LhqbyRw+8SeH2ORDhx7A0kKJcc2MVHprzUHw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v4 4/8] python-typing: Removal of this python2 module. Date: Thu, 5 Aug 2021 23:01:48 +0200 Message-Id: <20210805210152.3467498-4-adolf.belka@ipfire.org> In-Reply-To: <20210805210152.3467498-1-adolf.belka@ipfire.org> References: <20210805210152.3467498-1-adolf.belka@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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - With the removal of python-m2crypto then python-typing is no longer rerquired as a dependency. - The functionality of the python2 typing module is built in to python3. Signed-off-by: Adolf Belka --- config/rootfiles/common/python-typing | 3 - lfs/python-typing | 79 --------------------------- 2 files changed, 82 deletions(-) delete mode 100644 config/rootfiles/common/python-typing delete mode 100644 lfs/python-typing diff --git a/config/rootfiles/common/python-typing b/config/rootfiles/common/python-typing deleted file mode 100644 index 519796ca4..000000000 --- a/config/rootfiles/common/python-typing +++ /dev/null @@ -1,3 +0,0 @@ -#usr/lib/python2.7/site-packages/typing-3.6.1-py2.7.egg-info -#usr/lib/python2.7/site-packages/typing.py -#usr/lib/python2.7/site-packages/typing.pyc diff --git a/lfs/python-typing b/lfs/python-typing deleted file mode 100644 index d7bbe412b..000000000 --- a/lfs/python-typing +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# 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.6.1 - -THISAPP = typing-$(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)_MD5 = 3fec97415bae6f742fb3c3013dedeb89 - -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) && python setup.py build - cd $(DIR_APP) && python setup.py install --skip-build - @rm -rf $(DIR_APP) - @$(POSTBUILD)