From patchwork Thu Apr 7 11:04:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5463 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 4KYz8D67XJz3x1w for ; Thu, 7 Apr 2022 11:06: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 4KYz8D2hdsz1Vp; Thu, 7 Apr 2022 11:06:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KYz8D2hMSz2xSd; Thu, 7 Apr 2022 11:06:04 +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 4KYz8C3RG5z2xKb for ; Thu, 7 Apr 2022 11:06:03 +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 4KYz8C1nyhzdh; Thu, 7 Apr 2022 11:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1649329563; 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=6a9j1MOLTEIkCwfpQdScps0DTfts0N+41NRpRXe8Sp4=; b=MX4y4oRL+rTo8AE6wl56six6uZiZLmv2pSN+I5MnrksgEpXw9vHwHNjEjF/qJqUg5wWKr5 DgIauFOWH4/XctAsQhzSW3Q5g3mswaNvhrzIUwvhRZKkZSvccGNj7rErOjOhg8ycx5nyfw 2WvhpTxw+W656+q7kTJZ/KSo4famKRQpJA3wsT2THDviLXl3MtUu9lm24pNhwYb72zARg6 GHy2UUXNqgBwkzkf3t3o0X/QDj5avnbF8b9N4zj5xEo0Gx8fp1Dlj6laHp4SNJmBSGrSiJ 0kg7DtoXTyyvwjy93TasTHAKo3If5AjB/HkrBX/3fuvQMZUJEb0YdkvxMWdTSA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1649329563; 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=6a9j1MOLTEIkCwfpQdScps0DTfts0N+41NRpRXe8Sp4=; b=9Nbw/wpVqn+cx+BgjydvGhCh+kJirg/LuhAK4XLCG9Q/nXLTgxw317RrLJkL9n90bx+Gfm x8ttZI58sI//q4Bg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 5/6] pigz: Removal from IPFire Date: Thu, 7 Apr 2022 13:04:48 +0200 Message-Id: <20220407110449.1923450-5-adolf.belka@ipfire.org> In-Reply-To: <20220407110449.1923450-1-adolf.belka@ipfire.org> References: <20220407110449.1923450-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" Signed-off-by: Adolf Belka Acked-by: Michael Tremer --- config/rootfiles/common/pigz | 2 - lfs/pigz | 80 ------------------------------------ make.sh | 1 - 3 files changed, 83 deletions(-) delete mode 100644 config/rootfiles/common/pigz delete mode 100644 lfs/pigz diff --git a/config/rootfiles/common/pigz b/config/rootfiles/common/pigz deleted file mode 100644 index 618d92464..000000000 --- a/config/rootfiles/common/pigz +++ /dev/null @@ -1,2 +0,0 @@ -#usr/bin/pigz -#usr/bin/unpigz diff --git a/lfs/pigz b/lfs/pigz deleted file mode 100644 index 7fe9177ef..000000000 --- a/lfs/pigz +++ /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 = 2.6 - -THISAPP = pigz-$(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)_BLAKE2 = 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING) - cd $(DIR_APP) && install -m 755 pigz /usr/bin/pigz - ln -svf pigz /usr/bin/unpigz - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 79f563eff..7c820f463 100755 --- a/make.sh +++ b/make.sh @@ -1673,7 +1673,6 @@ buildipfire() { lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 lfsmake2 proxy-accounting - lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS lfsmake2 lua