From patchwork Thu Jun 24 13:14:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4462 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4G9gZs65DVz3wYx for ; Thu, 24 Jun 2021 13:14:29 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4G9gZr1s5nz25q; Thu, 24 Jun 2021 13:14:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4G9gZq5w6jz2xmR; Thu, 24 Jun 2021 13:14:27 +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 4G9gZp50K6z2xLq for ; Thu, 24 Jun 2021 13:14:26 +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 4G9gZp0hkqz161; Thu, 24 Jun 2021 13:14:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1624540466; 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=UeNBt8MO1qf30Y1VM2607Z1xBY2vHOIYF+0U1WdCDEw=; b=eeD+JK8+ZMZ/Cb4MnHhW3a745g0lYDIzmAIZfH+2dTEncJYBfduhFvyFqGhGNvBLN/4wqv T2kuIj7vySLWYrBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1624540466; 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=UeNBt8MO1qf30Y1VM2607Z1xBY2vHOIYF+0U1WdCDEw=; b=vWXQFT9GjsIOgDPqlnjer6trps1z2VY1k/zOYAn5ZO17ibnp/OqC0J1Y0JFXLo6JqigWoY qzi7DpWyeOreVFLiiaquXGRIryeDcht0Fvl0XyBfQxXgGC71cUvpc7wLCj0h/VB6a7quqq OHjB4GBm7tOuTShGaWcdBmRquzjT9Cv2I/9/WP6GgANyTA3gnfOuSYfgjU/KxZ6yePKyOq pKlIlCTt/ASwcEOsDsyJ+MVfIvI7IPcbdSXtBX3nfl4tSIRjU8f369vhTRc+dmHm/95KL2 pZDK76rKtQc4qBK1HcXISVwJ/L8Om/jU3UP4FWqcqElnKtM7GWxySrsccRYDCA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] util-macros: remove this package from IPFire Date: Thu, 24 Jun 2021 15:14:19 +0200 Message-Id: <20210624131419.762012-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" - util-macros was originally installed as a build requirement for pciaccess which is a dependency of libvirt - Along the way of updates of pciaccess the build requirement for util-macros is no longer needed. pciaccess built without problems with util-macros removed. Signed-off-by: Adolf Belka Acked-by: Peter Müller --- config/rootfiles/common/util-macros | 4 -- lfs/util-macros | 83 ----------------------------- make.sh | 1 - 3 files changed, 88 deletions(-) delete mode 100644 config/rootfiles/common/util-macros delete mode 100644 lfs/util-macros diff --git a/config/rootfiles/common/util-macros b/config/rootfiles/common/util-macros deleted file mode 100644 index 1858667b3..000000000 --- a/config/rootfiles/common/util-macros +++ /dev/null @@ -1,4 +0,0 @@ -#usr/share/aclocal/xorg-macros.m4 -#usr/share/pkgconfig/xorg-macros.pc -#usr/share/util-macros -#usr/share/util-macros/INSTALL diff --git a/lfs/util-macros b/lfs/util-macros deleted file mode 100644 index 90a4ac135..000000000 --- a/lfs/util-macros +++ /dev/null @@ -1,83 +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 = 1.19.0 - -THISAPP = util-macros-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = util-macros -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 40e1caa49a71a26e0aa68ddd00203717 - -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) && ./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 fc03ebcd5..98f96797e 100755 --- a/make.sh +++ b/make.sh @@ -1590,7 +1590,6 @@ buildipfire() { lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog - lfsmake2 util-macros lfsmake2 libpciaccess lfsmake2 libyajl lfsmake2 libvirt