From patchwork Mon May 17 21:58:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4335 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 4FkY1C39hCz3wbb for ; Mon, 17 May 2021 21:58:39 +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 4FkY1C0N1Szjb; Mon, 17 May 2021 21:58:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FkY1B6qBMz2yTb; Mon, 17 May 2021 21:58:38 +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 4FkY192vGxz2xb4 for ; Mon, 17 May 2021 21:58:37 +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)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FkY183Z9Lzjb for ; Mon, 17 May 2021 21:58:36 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621288716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CXU3Rn5bo+eiEfw1xaTUz/T8mHjAFLle/eRnTK9KinY=; b=QL/p4glRw3F+5jsFSisqjDxSsnN6ZleIACNF7uKwr8L+81fDGctQIB3WcApxuKduDB9eTO IP+BDvVQHHizJABA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621288716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CXU3Rn5bo+eiEfw1xaTUz/T8mHjAFLle/eRnTK9KinY=; b=JDnoKkCkTGapI4H18Vu+gb8wvRvn9+KcpFI/I3jghHgJwIo8d3xsGe38skEWMSfWuPA93k x7ADjiTz/j8JL6U9tVCTHEbJwA1ssQGCg7el064uPGW+wrgOqJYM/vQ1C/RZ0G7PvNsVQo AR0fijepnUIj2b/OwNsqGrdv6JlTOSqhX0SiUXaM9nxKsn/aa0sXMAtBz7tr6ki31LkdJe KQx4BFxe4ReXC+oBbfnBoyb5NXqHyeZ0cpTDJckam0e8uS7d+yzrl1DTb0jauJ+8FdwP0r 3AnxWniC3pAbXXNqyapW0b/mMUQCj0x3YO6PqTJdigru96ZTYPweiIV2uhLAPg== Subject: [PATCH v2 09/11] Drop fbset To: development@lists.ipfire.org References: <52820aff-40b7-1aae-17a8-34c97276fe60@ipfire.org> <44b9848d-7f27-2258-4115-daa395ad9e8c@ipfire.org> <695af3d4-68c4-a1f8-2fd8-4008eb3f9b31@ipfire.org> <35d26ef9-e2d2-95fd-9320-79e056e28202@ipfire.org> <7cf1c835-9ac7-6f5c-5b07-a0ebba6dd93f@ipfire.org> <18f02f8f-10f3-f5fe-87b0-42bcaae6df32@ipfire.org> <5b96e731-5fd7-8b1b-761e-9f33e9531319@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: <802041c0-01b1-9af1-ba45-bdd98da091d7@ipfire.org> Date: Mon, 17 May 2021 23:58:35 +0200 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US 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" As discussed in https://wiki.ipfire.org/devel/telco/2021-05-03. Please note this patch does not remove fbset on existing installations, that has to be done via the corresponding upgrade script. Signed-off-by: Peter Müller --- config/rootfiles/common/fbset | 4 -- lfs/fbset | 79 ----------------------------------- 2 files changed, 83 deletions(-) delete mode 100644 config/rootfiles/common/fbset delete mode 100644 lfs/fbset diff --git a/config/rootfiles/common/fbset b/config/rootfiles/common/fbset deleted file mode 100644 index 15d937fea..000000000 --- a/config/rootfiles/common/fbset +++ /dev/null @@ -1,4 +0,0 @@ -#usr/man/man5/fb.modes.5 -#usr/man/man8/fbset.8 -usr/sbin/fbset -etc/fb.modes diff --git a/lfs/fbset b/lfs/fbset deleted file mode 100644 index ec3c2a63c..000000000 --- a/lfs/fbset +++ /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 = 2.1 - -THISAPP = fbset-$(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 = e547cfcbb8c1a4f2a6b8ba4acb8b7164 - -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) && make install - cp -f $(DIR_SRC)/config/fbset/fb.modes /etc/fb.modes - @rm -rf $(DIR_APP) - @$(POSTBUILD)