Changeset 827154b

Timestamp:

03/08/2023 05:53:15 PM (14 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.0, 12.1, kea, ken/TL2024, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

2554b06

Parents:

f0dd071

Message:

Update to btrfs-progs-6.2.1

See ticket #17734 for some details (mitigation of a btrfs-convert bug)

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• postlfs/filesystems/btrfs-progs.xml (modified) (7 diffs)

introduction/welcome/changelog.xml

@@ -40 +40 @@
     -->
     <listitem>
-      <para>March 7th, 2023</para>
-      <itemizedlist>
-        <listitem>
-          <para>[thomas] - Add a patch to fix gcc-go version string (part of gcc-12.2.0).</para>
+      <para>March 8th, 2023</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to btrfs-progs-6.2.1. Fixes
+          <ulink url="&blfs-ticket-root;17734">#17734</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[thomas] - Add a patch to fix gcc-go version string (part
+          of gcc-12.2.0).</para>
         </listitem>
       </itemizedlist>

packages.ent

@@ -41 +41 @@
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "6.1.3">
+<!ENTITY btrfs-progs-version          "6.2.1">
 <!ENTITY dosfstools-version           "4.2">
 <!ENTITY fuse3-version                "3.14.0">

postlfs/filesystems/btrfs-progs.xml

@@ -7 +7 @@
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "d5f703b4085dc745003c16d046d32c2b">
-  <!ENTITY btrfs-progs-size          "2.2 MB">
-  <!ENTITY btrfs-progs-buildsize     "53 MB (add 8.2 GB for tests)">
-  <!ENTITY btrfs-progs-time          "0.2 SBU (add 5.0 SBU for tests, but will be longer on slow disks)">
+  <!ENTITY btrfs-progs-md5sum        "01ae2a122acefb0f34ad7de8a41c213d">
+  <!ENTITY btrfs-progs-size          "2.3 MB">
+  <!ENTITY btrfs-progs-buildsize     "84 MB (transcient files created during tests need up to 10 GB)">
+  <!ENTITY btrfs-progs-time          "0.2 SBU (add 5.0 SBU for tests, up to 77 SBU on slow disks)">
 ]>
 
@@ -140 +140 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-documentation &amp;&amp;
+<screen><userinput>./configure --prefix=/usr           \
+            --disable-static        \
+            --disable-documentation &amp;&amp;
 make</userinput></screen>
 
@@ -166 +168 @@
    ./mkfs-tests.sh
    ./cli-tests.sh
+   sed 's/,orphan_file//' /etc/mke2fs.conf >./custom_mke2fs.conf &amp;&amp;
+   export MKE2FS_CONFIG=$PWD/custom_mke2fs.conf                  &amp;&amp;
    ./convert-tests.sh
+   unset MKE2FS_CONFIG &amp;&amp; rm custom_mke2fs.conf
    ./misc-tests.sh
    ./fuzz-tests.sh
@@ -219 +224 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
     <para>
       <parameter>--disable-documentation</parameter>: This switch
@@ -224 +232 @@
       <xref linkend="sphinx"/>.
     </para>
-<!-- not anymore in the commands
-    <para>
-      <command>mv tests/{cli,convert,misc,fuzz}-tests/ ...</command>: Disables
-      tests that fail and prevent tests from completing.
-    </para>
-
+    <para>
+      <command>sed 's/,orphan_file//" ...</command>: In this version of
+      <application>btrfs-progs</application>, the
+      <command>btrfs-convert</command> program produces a btrfs filesystem
+      containing errors if converting from an ext4 filesystem created
+      with the <quote>orphan_file</quote> feature. This command creates
+      a custom configuration file that prevents creating a filesystem
+      with this feature.
+    </para>
+    <!--
     <para>
       <command>ln -s ... /usr/lib/libbtrfs.so</command>: Creates a
@@ -240 +252 @@
     </para>
 -->
+  </sect2>
+
+  <sect2 role="using" id="using-btrfs-convert">
+    <title>Using the btrfs-convert Program</title>
+
+    <para>
+      This version of <application>btrfs-progs</application> does not convert
+      correctly ext4 filesystems to btrfs if the ext4
+      <option>orphan_file</option> feature is turned on. If you happen to
+      convert such a filesystem, you need to first run:
+    </para>
+
+<screen role="nodump"><userinput>tune2fs -O ^orphan_file <replaceable>/dev/sdxx</replaceable></userinput></screen>
+
+    <para>
+      where <filename>/dev/sdxx</filename> is the partition of the filesystem
+      you want to convert.
+    </para>
   </sect2>
 
@@ -294 +324 @@
         <listitem>
           <para>
-            converts from an ext2/3/4 or reiserfs filesystem to btrfs
+            converts from an ext2/3/4 or reiserfs filesystem to btrfs (see
+            <xref linkend="using-btrfs-convert"/> above)
           </para>
           <indexterm zone="btrfs-progs btrfs-convert">