Changeset 0ea195f4

Timestamp:

07/06/2021 06:20:10 PM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f84c8814

Parents:

400a78e8

Message:

Partially fix #15223 (mdadm, net-tools)

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netprogs/net-tools.xml (modified) (2 diffs)
• postlfs/filesystems/mdadm.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -49 +49 @@
           <ulink url="&blfs-ticket-root;15236">#15236</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[thomas] - Adapted mdadm and net-tools to changes in 
+          merged-/usr. Partially fixes 
+          <ulink url="&blfs-ticket-root;15223">#15223</ulink>.</para>
+        </listitem>
       </itemizedlist>
     </listitem>

networking/netprogs/net-tools.xml

@@ -126 +126 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-remove_dups-1.patch &amp;&amp;
+<screen><userinput>sed -e "s;/\(s\|\)bin;/usr&amp;;g" -i Makefile &amp;&amp;
+patch -Np1 -i ../net-tools-&net-tools-version;-remove_dups-1.patch &amp;&amp;
 sed -i '/#include &lt;netinet\/ip.h&gt;/d'  iptunnel.c &amp;&amp;
 
@@ -146 +147 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i "s;/\(s\|\)bin;/usr&amp;;g" -i Makefile</command>:
+      Modifies the <filename>Makefile</filename> to get the binaries
+      installed in the <filename class="directory">/usr</filename> hierarchy.
+    </para>
 
     <para>

postlfs/filesystems/mdadm.xml

@@ -154 +154 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make BINDIR=/usr/sbin install</userinput></screen>
 
   </sect2>