From patchwork Tue Feb 1 13:52:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5027 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 4Jp5wr56lmz3wp0 for ; Tue, 1 Feb 2022 13:53:00 +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 4Jp5wl43tjzTp; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl1pr4z30b1; Tue, 1 Feb 2022 13:52:55 +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 4Jp5wj6fszz2xVY for ; Tue, 1 Feb 2022 13:52: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 4Jp5wj3Yrsz2DC; Tue, 1 Feb 2022 13:52:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723573; 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=uKsFT+FIbgLFxt9kwHDfzoJhtfzaie08zm8hb8Y64Cc=; b=aJTiyU0cFIGB0dhFML9evJbhuuHLPctLJASutDXOmbzmA+HNtS0UwvNUQb2yLsQWu7qind 3s0dEodMDDRJtADw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723573; 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=uKsFT+FIbgLFxt9kwHDfzoJhtfzaie08zm8hb8Y64Cc=; b=XIwPMDtqsdiBgo14AYvHHJ+mAmTf+M81dtnWaCvY19VMoXz3XCFQCSQBkGeE1n+c57+WDP 6awFVYJF/pFe/buJjTcVSJBB0YROW4raPio0FHOKAa7yqtOrZznYpSK1zDN+Sgg0SAZbfb Cb5CODOF2nWuEE6gk8UErR08LuiwuwFDDxXCATVVTxpPfRqrnMKyqCf1YCWyDh5HZ7+ILv wbkVYhOJQ30x8tG5M9kFxwTJxIoqOMfSwnNZA2NFwa0xHnzfQD6LpkzwPyXmLNMIS1vxlD GLALpH5SaEDjXbeRQ0kpA3i38/quV51rfvhnQ04S2B476SRvAWjKGSXuKZtJIw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/10] jq: New package Date: Tue, 1 Feb 2022 13:52:38 +0000 Message-Id: <20220201135246.4096955-2-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-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 allows parsing JSON strings on the console Signed-off-by: Michael Tremer --- config/rootfiles/common/jq | 14 +++++++ lfs/jq | 81 ++++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 96 insertions(+) create mode 100644 config/rootfiles/common/jq create mode 100644 lfs/jq diff --git a/config/rootfiles/common/jq b/config/rootfiles/common/jq new file mode 100644 index 000000000..7413eb883 --- /dev/null +++ b/config/rootfiles/common/jq @@ -0,0 +1,14 @@ +usr/bin/jq +#usr/include/jq.h +#usr/include/jv.h +#usr/lib/libjq.a +#usr/lib/libjq.la +#usr/lib/libjq.so +usr/lib/libjq.so.1 +usr/lib/libjq.so.1.0.4 +#usr/share/doc/jq +#usr/share/doc/jq/AUTHORS +#usr/share/doc/jq/COPYING +#usr/share/doc/jq/README +#usr/share/doc/jq/README.md +#usr/share/man/man1/jq.1 diff --git a/lfs/jq b/lfs/jq new file mode 100644 index 000000000..067063e1f --- /dev/null +++ b/lfs/jq @@ -0,0 +1,81 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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.6 + +THISAPP = jq-$(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 = e68fbd6a992e36f1ac48c99bbf825d6b + +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) && ./configure --prefix=/usr \ + --without-oniguruma + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5f22f7409..fca4b24c0 100755 --- a/make.sh +++ b/make.sh @@ -1129,6 +1129,7 @@ buildbase() { lfsmake2 util-linux lfsmake2 vim lfsmake2 e2fsprogs + lfsmake2 jq } buildipfire() {