From patchwork Fri Dec 20 11:40:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8332 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YF57g0cgqz3x61 for ; Fri, 20 Dec 2024 11:40:15 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YF57Z661hz6CX; Fri, 20 Dec 2024 11:40:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YF57Z1B2Xz34G8; Fri, 20 Dec 2024 11:40:10 +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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YF57W4JkPz32qN for ; Fri, 20 Dec 2024 11:40:07 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4YF57W12zyz1ZF; Fri, 20 Dec 2024 11:40:07 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1734694807; 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=h9Ak1+kk2ZWoB75Z2R3FVuxaK2CaA576aopQAHWjWe0=; b=CfXFEoVCMfwpEtgomsOiF/ANOcKG5p25SXLtqD7woXic2wPMGd7bq6QWKa3UsVSQQidXwm /iE91wDDD0gNUgBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1734694807; 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=h9Ak1+kk2ZWoB75Z2R3FVuxaK2CaA576aopQAHWjWe0=; b=Ua9y6bZu4lTuvIW6RwBNMog7jHy6RihAhSe0bWlWvUqyHIhpHR4r7jVErzXpciSKBrZGI4 npT06QZpDzqTe3aSE++klKbK7FRH9roAVbZqat5zq5F6QjWqUoF6t5SgHqTM3wV9VbZ5jq BkhGHAqymDV0TzLZjHHpKDQbjWl9g/+Zk0GFIaMpo12T1qw1qK/dC+JD5418O9kSL/jJZ4 e6eRge8MjXLLuS1/VkR+aU5eZJji3eP/Es+Ce5S5FeQMUFUrX5dn9XUP3DwhdN2MkMs3/I hrqH53kj2Pqz50+VGYQoPFmUh4GmcEz5SPHmgnTjkvYodjpqAtoEnqflOS9+Jw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] libyajl: Removal of addon as no longer required by libvirt Date: Fri, 20 Dec 2024 12:40:02 +0100 Message-ID: <20241220114002.78636-2-adolf.belka@ipfire.org> In-Reply-To: <20241220114002.78636-1-adolf.belka@ipfire.org> References: <20241220114002.78636-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: OVD7DTFDZJT7GVEQ53ID4AWLS5VXLERJ X-Message-ID-Hash: OVD7DTFDZJT7GVEQ53ID4AWLS5VXLERJ X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - libyajl is no longer being used by libvirt. libvirt now uses json-c which is a core package in IPFire. libyajl was stopped being used as it had not been updated and is considered effectively dead upstream. - lfs, rootfile and libyajl entry in make.sh removed. Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- config/rootfiles/packages/libyajl | 13 ----- lfs/libyajl | 88 ------------------------------- make.sh | 1 - 3 files changed, 102 deletions(-) delete mode 100644 config/rootfiles/packages/libyajl delete mode 100644 lfs/libyajl diff --git a/config/rootfiles/packages/libyajl b/config/rootfiles/packages/libyajl deleted file mode 100644 index f575f6a1b..000000000 --- a/config/rootfiles/packages/libyajl +++ /dev/null @@ -1,13 +0,0 @@ -usr/bin/json_reformat -usr/bin/json_verify -#usr/include/yajl -#usr/include/yajl/yajl_common.h -#usr/include/yajl/yajl_gen.h -#usr/include/yajl/yajl_parse.h -#usr/include/yajl/yajl_tree.h -#usr/include/yajl/yajl_version.h -#usr/lib/libyajl.so -usr/lib/libyajl.so.2 -usr/lib/libyajl.so.2.1.0 -#usr/lib/libyajl_s.a -#usr/share/pkgconfig/yajl.pc diff --git a/lfs/libyajl b/lfs/libyajl deleted file mode 100644 index eccae6489..000000000 --- a/lfs/libyajl +++ /dev/null @@ -1,88 +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 - -SUMMARY = Yet Another JSON Library - -VER = 2.1.0 - -THISAPP = libyajl-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libyajl -PAK_VER = 1 - -DEPS = - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = e0f2d0300d2cc35599d8b080fa0102a532b52f3ca3cf96db020ecc54bdab04aff971184a411776d263ac06ae9333d1dca03b3437d65b7247eea9919ca25b6d43 - -install: $(TARGET) - -check: $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download: $(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && cmake -DCMAKE_INSTALL_PREFIX=/usr . - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index ee098d9a3..3fc127ce0 100755 --- a/make.sh +++ b/make.sh @@ -2034,7 +2034,6 @@ build_system() { lfsmake2 dmidecode lfsmake2 mcelog lfsmake2 libpciaccess - lfsmake2 libyajl lfsmake2 libvirt lfsmake2 freeradius lfsmake2 perl-common-sense