From patchwork Wed Feb 12 09:34:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2777 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHn3S1Rz3xYL for ; Wed, 12 Feb 2020 09:35:17 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHm5VXGzj1; Wed, 12 Feb 2020 09:35:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHm3K8rz2yxh; Wed, 12 Feb 2020 09:35:16 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHh0trcz2yXw for ; Wed, 12 Feb 2020 09:35:12 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHg70JFzQ1; Wed, 12 Feb 2020 09:35:11 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500112; 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=0+sKFHanmBzCb6taNAJ1RProhUSjWJCG3G+TOot8wSg=; b=0l5KhTyqhN+gpDVADKHDS0uy1Vym/nHqzSRVZTeXKGPhiAiUgN/L33OUYmEVPj5bcsoxdq eotmOYMCiAyEi1Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500112; 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=0+sKFHanmBzCb6taNAJ1RProhUSjWJCG3G+TOot8wSg=; b=L6rc5v4sIPdaL2PMs2bd1Y/NaOykCVITz/wbmHxIQdw+wEKFHrjNDYh8rdmytiGlEokO7i k1sVuSfJMXfe671Sd6VqCf787NTzSUEqn358JCdFJDPvnVBzXuZu7el0B6JPC7r6CM0koj r/+kOOinPctBFygu2KoNa9doxK/QRb4rOmPhC/ux6dM7D5XBSylCY4ps0/gjvhhQb/vbq5 rBuqD+Pf9tYWV9iqrAlanLEDt8TUC9+mr4uQGKVYXyC15qz5LvGJRu4DTjftf9tGeZm5ir 2Lip7iBq8UjlUSIEqq/B6uJMJXk7KSZY8LjxYI7sHeRJL8WfmQbjBtI8Vl7BHQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/14] Drop batctl Date: Wed, 12 Feb 2020 09:34:41 +0000 Message-Id: <20200212093453.5732-3-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This package is no longer used. BATMAN is slightly out of fashion and can be disabled in our kernel, too. Signed-off-by: Michael Tremer --- config/rootfiles/common/batctl | 2 - lfs/batctl | 79 ---------------------------------- make.sh | 1 - 3 files changed, 82 deletions(-) delete mode 100644 config/rootfiles/common/batctl delete mode 100644 lfs/batctl diff --git a/config/rootfiles/common/batctl b/config/rootfiles/common/batctl deleted file mode 100644 index a4f49c27e..000000000 --- a/config/rootfiles/common/batctl +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin/batctl -#usr/share/man/man8/batctl.8 diff --git a/lfs/batctl b/lfs/batctl deleted file mode 100644 index 36401609c..000000000 --- a/lfs/batctl +++ /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 = 2014.3.0 - -THISAPP = batctl-$(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 = 7d2b8c129424c014d020c4b1a2add31b - -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 axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install PREFIX=/usr - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 6adb3829c..43dc41e6e 100755 --- a/make.sh +++ b/make.sh @@ -1589,7 +1589,6 @@ buildipfire() { lfsmake2 iotop lfsmake2 stunnel lfsmake2 bacula - lfsmake2 batctl lfsmake2 perl-Font-TTF lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2