From 7ba3706b0ff6df75a5dbe8d91a15f000c3942362 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Mar 2021 14:58:43 +0000 Subject: [PATCH] Drop python3-setuptools This package comes with the Python 3 distribution Signed-off-by: Michael Tremer --- config/rootfiles/common/python3-setuptools | 13 ---- lfs/python3-setuptools | 84 ---------------------- make.sh | 1 - 3 files changed, 98 deletions(-) delete mode 100644 config/rootfiles/common/python3-setuptools delete mode 100644 lfs/python3-setuptools diff --git a/config/rootfiles/common/python3-setuptools b/config/rootfiles/common/python3-setuptools deleted file mode 100644 index 177e95c734..0000000000 --- a/config/rootfiles/common/python3-setuptools +++ /dev/null @@ -1,13 +0,0 @@ -#usr/lib/python3.8/site-packages/pkg_resources/py31compat.py -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/PKG-INFO -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/SOURCES.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/dependency_links.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/entry_points.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/requires.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/top_level.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/zip-safe -#usr/lib/python3.8/site-packages/setuptools/glibc.py -#usr/lib/python3.8/site-packages/setuptools/pep425tags.py -#usr/lib/python3.8/site-packages/setuptools/py36compat.py -#usr/lib/python3.8/site-packages/setuptools/site-patch.py diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools deleted file mode 100644 index 8a78fbe021..0000000000 --- a/lfs/python3-setuptools +++ /dev/null @@ -1,84 +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 = 40.6.3 - -THISAPP = setuptools-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python3-setuptools -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 425b58efe131537abde25c1b5624527a - -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) && sed -e '/tag_build = .post/d' -e '/tag_date = 1/d' -i setup.cfg - cd $(DIR_APP) && python3 bootstrap.py - cd $(DIR_APP) && python3 setup.py build - cd $(DIR_APP) && python3 setup.py install --root=/ - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 0feea8d46a..98ffee0d1f 100755 --- a/make.sh +++ b/make.sh @@ -1562,7 +1562,6 @@ buildipfire() { lfsmake2 python-lzma lfsmake2 python-progressbar lfsmake2 ddns - lfsmake2 python3-setuptools lfsmake2 python3-setuptools-scm lfsmake2 python3-six lfsmake2 python3-dateutil -- 2.39.5