Changeset 37e35d2 for chapter08/kmod.xml


Ignore:
Timestamp:
06/29/2020 07:55:01 AM (4 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
Children:
c4804e8
Parents:
d4fdde6
Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:
1 moved

Legend:

Unmodified
Added
Removed

  • chapter08/kmod.xml

    rd4fdde6 r37e35d2  
    3232
    3333      <seglistitem>
    34         <seg>&kmod-ch6-sbu;</seg>
    35         <seg>&kmod-ch6-du;</seg>
     34        <seg>&kmod-fin-sbu;</seg>
     35        <seg>&kmod-fin-du;</seg>
    3636      </seglistitem>
    3737    </segmentedlist>
    … …  
    7979    several tests will not run outside of a git repository. </para>
    8080
    81 <!--
    82     <para>To test the results, issue:</para>
    83 
    84 <screen><userinput remap="test">make check</userinput></screen>
    85 -->
    86     <para>Install the package, and create symlinks for
     81    <para>Install the package and create symlinks for
    8782    compatibility with Module-Init-Tools (the package that previously handled
    8883    Linux kernel modules):</para>
    … …  
    9893  </sect2>
    9994
    100   <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     95  <!-- - - - - - - - - - -->
     96  <!-- Multilib - 32bit  -->
     97  <!-- - - - - - - - - - -->
    10198 
    10299  <sect2 arch="ml_32,ml_all" role="installation">
    103     <title>Installation of Kmod - 32-bit</title>
    104 
    105     <para>Clean previous build but keep man pages as they cannot be recreated
    106     since xsltproc isn't installed yet:</para>
    107 
    108 <screen><userinput>sed -e "s/^CLEANFILES =.*/CLEANFILES =/" -i man/Makefile
     100    <title>Installation of Kmod - 32bit</title>
     101
     102    <para>Clean previous build but keep man pages as they cannot
     103    be recreated since xsltproc isn't installed yet:</para>
     104
     105<screen><userinput remap="pre">sed -e "s/^CLEANFILES =.*/CLEANFILES =/" -i man/Makefile
    109106make clean</userinput></screen>
    110107
    111108    <para>Prepare Kmod for compilation:</para>
    112109
    113 <screen><userinput remap="configure">CC="gcc -m32" ./configure    \
    114     --prefix=/usr            \
    115     --bindir=/bin            \
    116     --libdir=/usr/lib32      \
    117     --sysconfdir=/etc        \
    118     --with-xz --with-zlib    \
    119     --host=i686-pc-linux-gnu \
    120     --with-rootlibdir=/usr/lib32</userinput></screen>
     110<screen><userinput remap="configure">CC="gcc -m32" ./configure \
     111    --prefix=/usr                 \
     112    --bindir=/bin                 \
     113    --libdir=&usr-lib-m32;          \
     114    --sysconfdir=/etc             \
     115    --with-xz                     \
     116    --with-zlib                   \
     117    --host=i686-pc-linux-gnu      \
     118    --with-rootlibdir=&usr-lib-m32;</userinput></screen>
    121119
    122120    <para>Compile the package:</para>
    … …  
    127125
    128126<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    129 cp -Rv DESTDIR/usr/lib32/* /usr/lib32
     127cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
    130128rm -rf DESTDIR</userinput></screen>
    131129
    132   </sect2>
    133 
    134   <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     130  </sect2><!-- m32 -->
     131
     132  <!-- - - - - - - - - - -->
     133  <!-- Multilib - x32bit -->
     134  <!-- - - - - - - - - - -->
    135135 
    136136  <sect2 arch="ml_x32,ml_all" role="installation">
    137     <title>Installation of Kmod - x32-bit</title>
    138 
    139     <para>Clean previous build:</para>
    140 
    141 <screen><userinput>sed -e "s/^CLEANFILES =.*/CLEANFILES =/" -i man/Makefile
     137    <title>Installation of Kmod - x32bit</title>
     138
     139    <para>Clean previous build but keep man pages as they cannot
     140    be recreated since xsltproc isn't installed yet:</para>
     141
     142<screen><userinput remap="pre">sed -e "s/^CLEANFILES =.*/CLEANFILES =/" -i man/Makefile
    142143make clean</userinput></screen>
    143144
    144145    <para>Prepare Kmod for compilation:</para>
    145146
    146 <screen><userinput remap="configure">CC="gcc -mx32" ./configure        \
     147<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    147148    --prefix=/usr                 \
    148149    --bindir=/bin                 \
    149     --libdir=/usr/libx32          \
     150    --libdir=&usr-lib-mx32;          \
    150151    --sysconfdir=/etc             \
    151152    --with-xz                     \
    152153    --with-zlib                   \
    153154    --host=x86_64-pc-linux-gnux32 \
    154     --with-rootlibdir=/usr/libx32</userinput></screen>
     155    --with-rootlibdir=&usr-lib-mx32;</userinput></screen>
    155156
    156157    <para>Compile the package:</para>
    … …  
    161162
    162163<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    163 cp -Rv DESTDIR/usr/libx32/* /usr/libx32
     164cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
    164165rm -rf DESTDIR</userinput></screen>
    165166
    166   </sect2>
     167  </sect2><!-- mx32 -->
    167168
    168169  <sect2 id="contents-kmod" role="content">
Note: See TracChangeset for help on using the changeset viewer.