From patchwork Mon Jun 28 19:13:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4473 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 4GDHPM1rVlz3x1K for ; Mon, 28 Jun 2021 19:15:19 +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 4GDHPL6Vf1z1fy; Mon, 28 Jun 2021 19:15:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GDHPL4sFhz2yTP; Mon, 28 Jun 2021 19:15:18 +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 4GDHPK3gq2z2xLY for ; Mon, 28 Jun 2021 19:15:17 +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 4GDHPJ4p6nzL8; Mon, 28 Jun 2021 19:15:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1624907716; 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=CwIejJKFKezMe9pw0CV4ScbMqIweqeZImjmbTdcSLKI=; b=AUxUMSIgvJ79haTEzQILzfAW1vIk/duPnQRP6PtZcxDwUldqCgdDb3/my86tj8dITcs+RD ul1yVzNH2bO81eDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1624907716; 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=CwIejJKFKezMe9pw0CV4ScbMqIweqeZImjmbTdcSLKI=; b=tsGQFeBXe5hnr9nogFPsB0nw/Bkk34U9ijbQA0dVJx9lFyMarBJ6/ljQ7+Eq5rjB0AWsKc acKPwPYpiaAE7irBoy+UBfQ5V7WKJxfPNBEAIbugXxGMlx0pvY1araZCUIAWv4ZHhnpB2n lHQ7nNNVoNh0fDxkhAsBZid1CF42kX4qy9E7ZW6TUiog4xeBmVQWiU/LNWg8I3AWRmDTjP UW469Is+PqV1Z4Jve/j/zqIY06zipehfaCXl72OFhuM2C6xOeN39i8ED6hMc+Cbi1+hLl9 uyMWu37jOAQmKq/sy+94EUax0njO5JjghNBQrpzG3gK8wXfI9RRrnRweaynPZg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 5/6] python-setuptools: Removal of this python2 module. Date: Mon, 28 Jun 2021 21:13:59 +0200 Message-Id: <20210628191400.2860975-5-adolf.belka@ipfire.org> In-Reply-To: <20210628191400.2860975-1-adolf.belka@ipfire.org> References: <20210628191400.2860975-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 this module is not longer required as a dependency. - python3-setuptools was already released into Core Update 157 Signed-off-by: Adolf Belka --- config/rootfiles/common/python-setuptools | 5 -- lfs/python-setuptools | 80 ----------------------- 2 files changed, 85 deletions(-) delete mode 100644 config/rootfiles/common/python-setuptools delete mode 100644 lfs/python-setuptools diff --git a/config/rootfiles/common/python-setuptools b/config/rootfiles/common/python-setuptools deleted file mode 100644 index 15b22ac39..000000000 --- a/config/rootfiles/common/python-setuptools +++ /dev/null @@ -1,5 +0,0 @@ -#usr/bin/easy_install -#usr/bin/easy_install-2.7 -#usr/lib/python2.7/site-packages/easy-install.pth -#usr/lib/python2.7/site-packages/setuptools-0.6c11-py2.7.egg -#usr/lib/python2.7/site-packages/setuptools.pth diff --git a/lfs/python-setuptools b/lfs/python-setuptools deleted file mode 100644 index 1ffcfca18..000000000 --- a/lfs/python-setuptools +++ /dev/null @@ -1,80 +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 = 0.6c11 - -THISAPP = setuptools-$(VER) -DL_FILE = $(THISAPP)-py2.7.egg -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-setuptools -PAK_VER = 2 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = fe1f997bc722265116870bc7919059ea - -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) - bash $(DIR_DL)/$(DL_FILE) - @$(POSTBUILD)