From patchwork Wed Jul 9 12:09:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8919 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 4bccHJ35gGz3wnc for ; Wed, 9 Jul 2025 12:10:04 +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 4bccHC2T6Rz6v4 for ; Wed, 9 Jul 2025 12:09:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bccHC05Wyz34CH for ; Wed, 9 Jul 2025 12:09:59 +0000 (UTC) X-Original-To: development@lists.ipfire.org 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 4bccH80BQqz2xSL for ; Wed, 9 Jul 2025 12:09:56 +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 4bccH71DyNz83; Wed, 9 Jul 2025 12:09:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1752062995; 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=F13OqqQhqQiWY+Lz30eVssYbDMiSVIun/XTxbmVPh44=; b=P7rE5ie+gru3disimY9QOKtXcGLzjP1STE+HxnRrq79djphx7auOxLEZMiuoOguEJcsPYM idTqKj97hkZxV9Cw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1752062995; 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=F13OqqQhqQiWY+Lz30eVssYbDMiSVIun/XTxbmVPh44=; b=RWg6PanUbylUTVy9thpxn2plJp9bywq/GOrwiv+rauQ2UMjM0ST//o4sHH0bzfuNmrqyRO wEVICU4dd6FAzbAPXuBweNGRMsScEUAeyRfvtzrWaSKuV2oEKNHTmnXq8WeIesVrrU7kka IHrY73811JZIw7VzSDh+EFU+neSASWgLDIBpr1uoZ3vzT3AjCrostYtElwCtCwpXOu7TU+ EpYo8pnr3SEs8dF6HXjOhCXy4Qq7P8TuO6qfsIGFbdmUcqEKFTSBKggx0MaPi9n1bHD6Ki m8/Ahvop+aDwz3oJFe3eueAec8c3sDE/Ej5RcvDTv2XAoRqw6WibHpDjsDuF4g== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 1/4] json-glib: Move to be built after glib has been built Date: Wed, 9 Jul 2025 14:09:49 +0200 Message-ID: <20250709120952.210031-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - Shifted to build after glib is built and removed the dist entry that is used for addons. - Checked the glib library and the libgio entries are uncommented so that should be okay - Checked build and this package then built with no problems but in the addon package build section libtpms failed to build as it was missing the dist entry. Also the same with swtpm so this is a patch set with the changes to those two packages as well. - Full build tested out and confirmed working on x86_64 with this patch set applied. Signed-off-by: Adolf Belka --- lfs/json-glib | 3 --- make.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lfs/json-glib b/lfs/json-glib index 00617cd93..f0ac3b942 100644 --- a/lfs/json-glib +++ b/lfs/json-glib @@ -50,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) b2 : $(subst %,%_BLAKE2,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, b2sum ############################################################################### diff --git a/make.sh b/make.sh index 789d01540..dc1feb37a 100755 --- a/make.sh +++ b/make.sh @@ -1514,7 +1514,6 @@ build_system() { lfsmake2 libarchive lfsmake2 cmake lfsmake2 json-c - lfsmake2 json-glib lfsmake2 tcl lfsmake2 python3-MarkupSafe lfsmake2 python3-Jinja2 @@ -1526,6 +1525,7 @@ build_system() { lfsmake2 lvm2 lfsmake2 multipath-tools lfsmake2 glib + lfsmake2 json-glib lfsmake2 libgudev lfsmake2 libgpg-error lfsmake2 libgcrypt