From patchwork Wed Feb 10 11:06:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3886 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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DbHCr3dlfz3wpr for ; Wed, 10 Feb 2021 11:12:24 +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 4DbHCp3svKzys; Wed, 10 Feb 2021 11:12:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DbH4Y00Zxz2yfT; Wed, 10 Feb 2021 11:06:05 +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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DbH4X4hCDz2xFP for ; Wed, 10 Feb 2021 11:06:04 +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 4DbH4W6vFNz1sk; Wed, 10 Feb 2021 11:06:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1612955164; 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; bh=fF5ci2bM3bZArtuQcA9NSDx8zMaIVkz5kZyLGFDRr/Q=; b=xTbrPKQN8K5bfiJRAvDlm2C+/ir12g/mRivDtPmey/zkAWC2XFWVxZQggeGOCHp/4uWfZi ZaAH4YaOldtBq6DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1612955164; 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; bh=fF5ci2bM3bZArtuQcA9NSDx8zMaIVkz5kZyLGFDRr/Q=; b=uJSX0GhLEMm7R8WNpct1JCt6lPg2uNfaaw1Eiskt+71TtnqO6ie9xSpYBk8D7JEs6B01tL RVOsLmU380h4sY1ipcpwubW3vJbUyWi5HmAyCJu0Iv+hEWGqAMBaPQ3sQGng0xIltibxxZ 86TlUmrQNf/2iSduutrNBi+hQJha9PLjjX8zc859rc7czQuuJKkrF0piN2EIuCCUhZROxL XrTuzxOb71QC5iX9dYPbKQfXKtJOXrpl8ns2VbRTtq0nfga3Aq6A3SErSY4rSfP6F0wXkU ZyPIbpk4p9DSgIqsrS1LMBTOopXB9L0nCcVW7/yH9pvKXYq59yF6kqq9ZZsJmg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] python-xattr: Removal of addon Date: Wed, 10 Feb 2021 12:06:02 +0100 Message-Id: <20210210110602.3711794-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" - Update of attr causes current version of python-xattr to fail to build - Following input from Michael Tremer - This package was orihinally required for pakfire 3 which no longer depends on it - This is a python 2 module. Python 2 is EOL - lfs and rootfile removed from IPFire - make.sh updated to remove python-xattr entry Signed-off-by: Adolf Belka --- config/rootfiles/packages/python-xattr | 2 - lfs/python-xattr | 82 -------------------------- make.sh | 1 - 3 files changed, 85 deletions(-) delete mode 100644 config/rootfiles/packages/python-xattr delete mode 100644 lfs/python-xattr diff --git a/config/rootfiles/packages/python-xattr b/config/rootfiles/packages/python-xattr deleted file mode 100644 index 747ff5c2a..000000000 --- a/config/rootfiles/packages/python-xattr +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python2.7/site-packages/pyxattr-0.5.0-py2.7.egg-info -usr/lib/python2.7/site-packages/xattr.so diff --git a/lfs/python-xattr b/lfs/python-xattr deleted file mode 100644 index a77d22a91..000000000 --- a/lfs/python-xattr +++ /dev/null @@ -1,82 +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.5.0 - -THISAPP = pyxattr-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-xattr -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 0f7ab1e185087329e40f7de218517c84 - -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 install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3c94509d3..4a42246fd 100755 --- a/make.sh +++ b/make.sh @@ -1552,7 +1552,6 @@ buildipfire() { lfsmake2 python-distutils-extra lfsmake2 python-lzma lfsmake2 python-progressbar - lfsmake2 python-xattr lfsmake2 ddns lfsmake2 python3-setuptools lfsmake2 python3-setuptools-scm