From patchwork Mon May 17 21:57:59 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: 4333 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 4FkY0W11Bfz3wbb for ; Mon, 17 May 2021 21:58:03 +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 4FkY0V5VJBz1TW; Mon, 17 May 2021 21:58:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FkY0V59pjz2xjj; Mon, 17 May 2021 21:58:02 +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 4FkY0T2Vg4z2xF1 for ; Mon, 17 May 2021 21:58:01 +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 4FkY0S3TJpzjb for ; Mon, 17 May 2021 21:58:00 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621288680; 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=IRvzNKA4mbmlzbrbcw8U8V5QKapq7+ieH4GL8Sb7jSg=; b=aAe6/Y4Xpd0BNYIs2qzWzy+JoLpkCBmffGNbpjtoiBC64jABEuneQtbjkbR7jMPCjcy3Wh ZtFe4xjqjQnxkJBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621288680; 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=IRvzNKA4mbmlzbrbcw8U8V5QKapq7+ieH4GL8Sb7jSg=; b=Va+KGzXE5Qbq9gU6N52IIbzLZcqasSATsDMOO+DKMus2FrwRL0snCmTLbPXMKaZ7SXIOQR ebRl+k7qtt6T+j008JAzPBN4UVzp6UCIEG0IIKVGgvZVfMnjOoiJiPsPCX2bHguPZWcGHo +/i93le/Be3Y0LT95Q0UVTcqIi4KkN5cnR2bQnVaS74rF9FOWiSLNkLZ39bXLL/p89ZLuU nXtOAz8ec2OR2USjlUgsL9F5vF3yz9tOjpTn5ZIWjGxyh8KZ+tP+voLSUzluSzwOiydUhS A2kbPz5HjmXix0dqBhXTi7seuhh1IWfIBVmcv8LDcsvG2djip/C3ICX04U4Xgg== Subject: [PATCH v2 07/11] Drop intltool add-on 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: Date: Mon, 17 May 2021 23:57:59 +0200 MIME-Version: 1.0 In-Reply-To: <5b96e731-5fd7-8b1b-761e-9f33e9531319@ipfire.org> 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. Signed-off-by: Peter Müller --- config/rootfiles/packages/intltool | 13 ----- lfs/intltool | 85 ------------------------------ make.sh | 1 - 3 files changed, 99 deletions(-) delete mode 100644 config/rootfiles/packages/intltool delete mode 100644 lfs/intltool diff --git a/config/rootfiles/packages/intltool b/config/rootfiles/packages/intltool deleted file mode 100644 index e1421fad7..000000000 --- a/config/rootfiles/packages/intltool +++ /dev/null @@ -1,13 +0,0 @@ -usr/bin/intltool-extract -usr/bin/intltool-merge -usr/bin/intltool-prepare -usr/bin/intltool-update -usr/bin/intltoolize -#usr/share/aclocal/intltool.m4 -#usr/share/intltool -#usr/share/intltool/Makefile.in.in -#usr/share/man/man8/intltool-extract.8 -#usr/share/man/man8/intltool-merge.8 -#usr/share/man/man8/intltool-prepare.8 -#usr/share/man/man8/intltool-update.8 -#usr/share/man/man8/intltoolize.8 diff --git a/lfs/intltool b/lfs/intltool deleted file mode 100644 index 234262f62..000000000 --- a/lfs/intltool +++ /dev/null @@ -1,85 +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.40.5 - -THISAPP = intltool-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = intltool -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 3e7ded6f50d88cf8b8bb505eaf591775 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -dist: - @$(PAK) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3bca46d8f..56c93fb79 100755 --- a/make.sh +++ b/make.sh @@ -1385,7 +1385,6 @@ buildipfire() { lfsmake2 openvpn lfsmake2 mpage lfsmake2 dbus - lfsmake2 intltool lfsmake2 libdaemon lfsmake2 avahi lfsmake2 cups