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 <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/btrfs-progs b/config/rootfiles/common/btrfs-progs
index 829e29ce6c1660fdf926ecb23a3c4c9fc978bf40..5d1763865e97612e65eb629bd74094e0c6d35c56 100644 (file)
--- 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 (symlink)
index 0000000..d7a2f6f
--- /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 c4a11a2765f0fccc9effc64a93ad074890acfa9d..bc6284b9be132efcf2d53c5412078fd4424393dc 100644 (file)
--- 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 cbeb179f3eb06d2c82b0e31feba00dff3108e0ae..a37e3d205caa3a3803b398085727259a4602c9ba 100644 (file)
--- 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)