From patchwork Fri Apr 30 08:09:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4239 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 4FWlQp5w3Zz44R4 for ; Fri, 30 Apr 2021 08:09:54 +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 4FWlQp4CjLz6Pg; Fri, 30 Apr 2021 08:09:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FWlQp3Pm8z2yl9; Fri, 30 Apr 2021 08:09:54 +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 4FWlQn1Ntjz2xmm for ; Fri, 30 Apr 2021 08:09:53 +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 4FWlQm4rLDz6Pl; Fri, 30 Apr 2021 08:09:52 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1619770192; 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=Zd4HLZqrlChpzIDu//H9QVwSjolYJKhiUTem2qo7kac=; b=imDiQWI7q9Mlcz3n0A4SLEouBRSeD3hEKV2cSV0N0Fco+uiAgNmzvmDTkQvBH50Xbl758r PiEg5mgWtgj/BNCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1619770192; 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=Zd4HLZqrlChpzIDu//H9QVwSjolYJKhiUTem2qo7kac=; b=wUlaTdnoTy+PyaLEJee4UgzpRPgyPztkOTUyJwpAVOFa87ucWTpPFwQvyhudY1H6LRcr/7 K+w53t0dZDV0EEWD48Yr1+stlARS+ZO7Lhw48V4oZQJbyqt1u3zLOJ8GY0uD6sgP0dydfS MqN7N07DY7rcV6iO5u6hMz3DWgYCCPedQngh4wiySvxKUaPXxP2vEglhTUUvaIu5DSrpW7 Gp2i963FpqMU0ocBzFp9wKtqAaiaAWQWKmF7GwFpYw4DsPwMF3QeMpwNhjgH0+zJIFUfnx BWbRRo0dm5Q3o/wqPlj0Gj5tEIIfN4ofnDev2ekJ7k7Q2Nn3l5BImAKZjxKPbg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] libinih: New dependency for build of xfsprogs Date: Fri, 30 Apr 2021 10:09:43 +0200 Message-Id: <20210430080943.244679-2-adolf.belka@ipfire.org> In-Reply-To: <20210430080943.244679-1-adolf.belka@ipfire.org> References: <20210430080943.244679-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" - libinih dependency for xfsprogs build from 5.10.0 - Creation of lfs file - Creation of rootfile - all entries commented out as this is only required during the build - Addition of libinih to make.sh Signed-off-by: Adolf Belka --- config/rootfiles/common/libinih | 8 ++++ lfs/libinih | 83 +++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 92 insertions(+) create mode 100644 config/rootfiles/common/libinih create mode 100644 lfs/libinih diff --git a/config/rootfiles/common/libinih b/config/rootfiles/common/libinih new file mode 100644 index 000000000..c8a467edc --- /dev/null +++ b/config/rootfiles/common/libinih @@ -0,0 +1,8 @@ +#usr/include/INIReader.h +#usr/include/ini.h +#usr/lib/libINIReader.so +#usr/lib/libINIReader.so.0 +#usr/lib/libinih.so +#usr/lib/libinih.so.0 +#usr/lib/pkgconfig/INIReader.pc +#usr/lib/pkgconfig/inih.pc diff --git a/lfs/libinih b/lfs/libinih new file mode 100644 index 000000000..bfecc35de --- /dev/null +++ b/lfs/libinih @@ -0,0 +1,83 @@ +############################################################################### +# # +# 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 = r53 + +THISAPP = inih-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libinih + + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 8b52bf308de2ad1eab94fad64c116610 + +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) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && meson --prefix=/usr builddir/ + cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 1c08af6e3..a8bb908a4 100755 --- a/make.sh +++ b/make.sh @@ -1283,6 +1283,7 @@ buildipfire() { lfsmake2 arping lfsmake2 beep lfsmake2 libssh + lfsmake2 libinih lfsmake2 cdrkit lfsmake2 dosfstools lfsmake2 reiserfsprogs