From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bbv8z5QX1z2ywd for ; Tue, 8 Jul 2025 08:17:07 +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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bbv8z58bcz2xYD for ; Tue, 8 Jul 2025 08:17:07 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (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 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4bbv8z0xQGzkH for ; Tue, 8 Jul 2025 08:17:07 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1751962627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=6uJMfiY/UkRshPR2ewTQTuLFQFYeoPP6d+eLVmTpYqI=; b=OkOJ0h4ST5mHL5gAQMr6yyxmxtcWdkdlVbEr8hD7H/nxrpdhEqKpYzbS6gyit6l8ivz4oJ +YuUt+SE2v/1MxDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1751962627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=6uJMfiY/UkRshPR2ewTQTuLFQFYeoPP6d+eLVmTpYqI=; b=VPOXBETvft6d1jlS9MDi99KddOSdXC+loPgJ5ardl2lRdegZreiC0U5xSaV8EurV+nrxw4 U94BS3Rbes7hL6O00+m2cXSyoSPi2Wf+ROPa3TyW6eonICiHlDBF6Q4CdZAVKrZ7zm7xz/ 8I+AFjcrLjMvjjQaXOHQd4jobMPOIlqxIisSqBtXoy8F4VsAsJb/hGef/pQ10fkN6KfebL WZjNHQ63GDTJO4rkp5nc0UCL0JEVQn0ojfZ/Itk8Tc1E7LhsKu5C0hcW09I2aUYAPZmTX5 zCoOuwQb6KlgBBN3/yxpVWZMp2T+C7TQ54xsmIHJCgSlReu7z6tYHW8R9v5z7Q== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4bbv8y6ZpWz2xcl; Tue, 8 Jul 2025 08:17:06 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 62d2bc18a1bb81d41344dffc0856369da42b21e9 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: cf9ed067657ac8a4c66b7e6d56f6b0cbb369a3d8 X-Git-Newrev: 62d2bc18a1bb81d41344dffc0856369da42b21e9 Message-Id: <4bbv8y6ZpWz2xcl@people01.haj.ipfire.org> Date: Tue, 8 Jul 2025 08:17:06 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 62d2bc18a1bb81d41344dffc0856369da42b21e9 (commit) from cf9ed067657ac8a4c66b7e6d56f6b0cbb369a3d8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 62d2bc18a1bb81d41344dffc0856369da42b21e9 Author: Michael Tremer Date: Tue Jul 8 08:15:53 2025 +0000 btrfs-progs: Fix incorrectly installed shared objects Please see the comment in the LFS file. This patch prevents the filesystem-cleanup script from removing libbtrfs*.so.*. Reported-by: Stefan Schantl Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/btrfs-progs | 2 -- .../rootfiles/{oldcore/186 => core/197}/filelists/btrfs-progs | 0 config/rootfiles/core/197/update.sh | 3 +++ lfs/btrfs-progs | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/186 => core/197}/filelists/btrfs-progs (100%) Difference in files: diff --git a/config/rootfiles/common/btrfs-progs b/config/rootfiles/common/btrfs-progs index 829e29ce6..5d1763865 100644 --- a/config/rootfiles/common/btrfs-progs +++ b/config/rootfiles/common/btrfs-progs @@ -23,11 +23,9 @@ usr/bin/mkfs.btrfs #usr/lib/libbtrfs.a #usr/lib/libbtrfs.so usr/lib/libbtrfs.so.0 -usr/lib/libbtrfs.so.0.1 usr/lib/libbtrfs.so.0.1.4 #usr/lib/libbtrfsutil.a #usr/lib/libbtrfsutil.so usr/lib/libbtrfsutil.so.1 -usr/lib/libbtrfsutil.so.1.3 usr/lib/libbtrfsutil.so.1.3.2 #usr/lib/pkgconfig/libbtrfsutil.pc diff --git a/config/rootfiles/core/197/filelists/btrfs-progs b/config/rootfiles/core/197/filelists/btrfs-progs new file mode 120000 index 000000000..d7a2f6f52 --- /dev/null +++ b/config/rootfiles/core/197/filelists/btrfs-progs @@ -0,0 +1 @@ +../../../common/btrfs-progs \ No newline at end of file diff --git a/config/rootfiles/core/197/update.sh b/config/rootfiles/core/197/update.sh index c4a11a276..bc6284b9b 100644 --- a/config/rootfiles/core/197/update.sh +++ b/config/rootfiles/core/197/update.sh @@ -34,6 +34,9 @@ done # Stop services # Remove files +rm -vf \ + /usr/lib/libbtrfs.so.0.? \ + /usr/lib/libbtrfsutil.so.1.? # Extract files extract_files diff --git a/lfs/btrfs-progs b/lfs/btrfs-progs index cbeb179f3..a37e3d205 100644 --- a/lfs/btrfs-progs +++ b/lfs/btrfs-progs @@ -83,5 +83,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-python cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + + # This package has an odd way to install its libraries. Instead of + # just having libbtrfs.so.0 which links to libbtrfs.so.0.1.4, there + # is an extra file called libbtrfs.so.0.1 and likewise for libbtrfsutil. + # This confuses our filesystem-cleanup script and is unnecessary. + # Therefore we remove the superfluous symlinks. + rm -vf \ + /usr/lib/libbtrfs.so.0.? \ + /usr/lib/libbtrfsutil.so.1.? + @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree