Changeset 216be86


Ignore:
Timestamp:
Apr 24, 2017, 10:21:28 AM (2 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
master, systemd
Children:
0fa3c9f
Parents:
c831ac4
Message:

Update Systemd to 233. Remove some configure options, add some new configure options. Tidy up the xml. Remove the compat-libs patch.

Location:
BOOK
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/systemd.xml

    rc831ac4 r216be86  
    2525    <title>Installation of Systemd</title>
    2626
    27     <para os="p1">Systemd 209 merged several libraries into
    28     <filename class="libraryfile">libsystemd</filename>, but some packages
    29     that use systemd still expect those separate libraries. Apply a patch
    30     to allow backwards compatibility with these packages by
    31     installing Pkg-config files for the old libraries:</para>
    32 
    33 <screen os="p2"><userinput>patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
    34 
    3527    <para os="s1">Prevent the <filename>Makefile</filename> from trying to run
    3628    <command>setcap</command> on <command>systemd-detect-virt</command>,
     
    4638<screen os="s4"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
    4739
    48     <para os="s5">By default, <command>systemd-fsck</command> will run
    49     <filename>/sbin/fsck</filename> with the <option>-l</option> option, which
    50     applies an <function>flock</function> on the file system being checked.
    51     This can conflict with an <function>flock</function> that
    52     systemd itself puts on the file system, which could result in problems
    53     booting. <command>fsck</command> will be fixed to avoid this problem in a
    54     future release of Util-linux, but for now we will work around the issue by
    55     simply preventing <command>systemd-fsck</command> from using <option>-l</option>:</para>
    56 
    57 <screen os="s6"><userinput>sed -i '/-l/d' src/fsck/fsck.c</userinput></screen>
    58 
    5940    <para os="a">Prepare systemd for compilation:</para>
     41
     42    <para os="cc1">Create a file to declare some variables</para>
     43
     44    <screen os="cc2"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
     45        KILL="/bin/kill"
     46        MOUNT_PATH="/bin/mount"
     47        UMOUNT_PATH="/bin/umount"
     48        SULOGIN="/sbin/sulogin"
     49        XSLTPROC="/usr/bin/xsltproc"
     50        EOF</userinput></screen>
    6051
    6152<screen os="b"><userinput>./configure \
     
    6859    --with-rootlibdir=/lib \
    6960    --enable-split-usr \
    70     --disable-gudev \
     61    --disable-firstboot \
     62    --disable-ldconfig \
     63    --disable-lto \
     64    --disable-sysusers \
     65    --with-default-dnssec=no \
    7166    --with-kbd-loadkeys=/bin/loadkeys \
    7267    --with-kbd-setfont=/bin/setfont \
    7368    --with-dbuspolicydir=/etc/dbus-1/system.d \
    74     --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
    7569    --with-dbussessionservicedir=/usr/share/dbus-1/services \
    7670    --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
    77     cc_cv_CFLAGS__flto=no</userinput></screen>
     71    --config-cache</userinput></screen>
    7872
    7973    <variablelist os="c">
    8074      <title>The meaning of the configure options:</title>
     75
     76      <varlistentry>
     77        <term><parameter>--config-cache</parameter></term>
     78        <listitem>
     79          <para>Use the created <filename>config.cache</filename>.</para>
     80        </listitem>
     81      </varlistentry>
    8182
    8283      <varlistentry>
     
    99100
    100101      <varlistentry>
    101         <term><parameter>--disable-gudev</parameter></term>
    102         <listitem>
    103           <para>This switch prevents systemd from building
    104           <filename class="libraryfile">libgudev</filename> as it requires
    105           Glib, which is not installed in CLFS.</para>
     102        <term><parameter>--disable-firstboot</parameter></term>
     103        <listitem>
     104          <para>This switch prevents installation of systemd services
     105            responsible for setting up the system for the first time.
     106            They are not useful for CLFS as everything is done manually.
     107          </para>
     108        </listitem>
     109      </varlistentry>
     110
     111      <varlistentry>
     112        <term><parameter>--disable-ldconfig</parameter></term>
     113        <listitem>
     114          <para>This switch prevents installation of a systemd unit that runs
     115          <command>ldconfig</command> at boot, and increases boot time.
     116          While it may be not useful for source distributions like CLFS,
     117          this option may be removed.</para>
     118        </listitem>
     119      </varlistentry>
     120
     121      <varlistentry>
     122        <term><parameter>--disable-lto</parameter></term>
     123        <listitem>
     124          <para>This prevents the build system from using GCC's Link-time
     125          optimization (LTO), to ensure that systemd's binaries will not try
     126          to link to <filename class="libraryfile">libgcc_s</filename></para>
     127        </listitem>
     128      </varlistentry>
     129
     130      <varlistentry>
     131        <term><parameter>--disable-sysusers</parameter></term>
     132        <listitem>
     133            <para>This switch prevents install of systemd services which setup
     134            the previously created <filename>/etc/group</filename> and
     135            <filename>/etc/passwd</filename> files.</para>
    106136        </listitem>
    107137      </varlistentry>
     
    116146
    117147      <varlistentry>
    118         <term><parameter>cc_cv_CFLAGS__flto=no</parameter></term>
    119         <listitem>
    120           <para>This prevents the build system from using GCC's Link-time
    121           optimization (LTO), to ensure that systemd's binaries will not try
    122           to link to <filename class="libraryfile">libgcc_s</filename>.</para>
     148        <term><parameter>--with-default-dnssec=no</parameter></term>
     149        <listitem>
     150          <para>This switch turns off the experimental DNNSEC support.</para>
    123151        </listitem>
    124152      </varlistentry>
     
    132160    <para os="f">Prevent a broken test case from running:</para>
    133161
    134 <screen os="g"><userinput remap="test">sed -e "s:test/udev-test.pl::g" \
    135     -e "s:test-bus-cleanup\$(EXEEXT) ::g" \
    136     -e "s:test-bus-gvariant\$(EXEEXT) ::g" \
    137     -i Makefile</userinput></screen>
     162<screen os="g"><userinput remap="test">sed -e 's@test/udev-test.pl @@' \
     163        -e 's@test-copy$(EXEEXT) @@' \
     164        -i Makefile.in
     165</userinput></screen>
    138166
    139167    <para os="h">To test the results, issue:</para>
    140168
    141 <screen os="i"><userinput remap="test">make check</userinput></screen>
     169    <screen os="i"><userinput remap="test">
     170            sed -i "s:minix:ext4:g" src/test/test-path-util.c
     171            make check</userinput></screen>
    142172
    143173    <para os="j">Install the package:</para>
     
    148178
    149179<screen os="m"><userinput>install -v -m644 man/*.html /usr/share/doc/systemd-&systemd-version;</userinput></screen>
    150 
    151     <para os="n">Move the
    152     <filename class="libraryfile">nss_myhostname</filename> library to
    153     <filename class="directory">/lib</filename>:</para>
    154 
    155 <screen os="o"><userinput>mv -v /usr/lib/libnss_myhostname.so.2 /lib</userinput></screen>
    156180
    157181    <para os="p">Remove an unnecessary directory:</para>
     
    165189done
    166190ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
    167 
    168     <para os="t">Modify a configuration file which references a group that
    169     doesn't exist:</para>
    170 
    171 <screen os="u"><userinput>sed -i "s@root lock@root root@g" /usr/lib/tmpfiles.d/legacy.conf</userinput></screen>
    172191
    173192  </sect2>
  • BOOK/final-system/multilib/systemd-64bit.xml

    rc831ac4 r216be86  
    2323    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2424    href="../common/systemd.xml"
    25     xpointer="xpointer(//*[@os='p1'])"/>
    26 
    27     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    28     href="../common/systemd.xml"
    29     xpointer="xpointer(//*[@os='p2'])"/>
    30 
    31     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    32     href="../common/systemd.xml"
    3325    xpointer="xpointer(//*[@os='s1'])"/>
    3426
     
    4739    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4840    href="../common/systemd.xml"
    49     xpointer="xpointer(//*[@os='s5'])"/>
     41    xpointer="xpointer(//*[@os='cc1'])"/>
    5042
    5143    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5244    href="../common/systemd.xml"
    53     xpointer="xpointer(//*[@os='s6'])"/>
     45    xpointer="xpointer(//*[@os='cc2'])"/>
    5446
    5547    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    6254    --sysconfdir=/etc \
    6355    --localstatedir=/var \
    64     --libdir=/usr/lib64 \
    6556    --libexecdir=/usr/lib64 \
    6657    --docdir=/usr/share/doc/systemd-&systemd-version; \
     
    6859    --with-rootlibdir=/lib64 \
    6960    --enable-split-usr \
    70     --disable-gudev \
     61    --disable-firstboot \
     62    --disable-ldconfig \
     63    --disable-lto \
     64    --disable-sysusers \
     65    --with-default-dnssec=no \
    7166    --with-kbd-loadkeys=/bin/loadkeys \
    7267    --with-kbd-setfont=/bin/setfont \
    7368    --with-dbuspolicydir=/etc/dbus-1/system.d \
    74     --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
    7569    --with-dbussessionservicedir=/usr/share/dbus-1/services \
    7670    --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
    77     cc_cv_CFLAGS__flto=no</userinput></screen>
     71    --config-cache</userinput></screen>
    7872
    7973    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    123117    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    124118    href="../common/systemd.xml"
    125     xpointer="xpointer(//*[@os='n'])"/>
    126 
    127 <screen><userinput>mv -v /usr/lib64/libnss_myhostname.so.2 /lib64</userinput></screen>
    128 
    129     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    130     href="../common/systemd.xml"
    131119    xpointer="xpointer(//*[@os='p'])"/>
    132120
     
    143131    xpointer="xpointer(//*[@os='s'])"/>
    144132
    145     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    146     href="../common/systemd.xml"
    147     xpointer="xpointer(//*[@os='t'])"/>
    148 
    149     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    150     href="../common/systemd.xml"
    151     xpointer="xpointer(//*[@os='u'])"/>
    152 
    153133  </sect2>
    154134
  • BOOK/final-system/multilib/systemd-n32.xml

    rc831ac4 r216be86  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="systemd.xml"
    26     xpointer="xpointer(//*[@os='mlw1'])"/>
     25    href="../common/systemd.xml"
     26    xpointer="xpointer(//*[@os='cc1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/systemd.xml"
    30     xpointer="xpointer(//*[@os='p1'])"/>
     30    xpointer="xpointer(//*[@os='cc2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/systemd.xml"
    34     xpointer="xpointer(//*[@os='p2'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="systemd.xml"
    3834    xpointer="xpointer(//*[@os='a'])"/>
    3935
    40 <screen><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
     36<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
    4137./configure \
    4238    --prefix=/usr \
    4339    --sysconfdir=/etc \
    4440    --localstatedir=/var \
    45     --libdir=/usr/lib32 \
    4641    --libexecdir=/usr/lib32 \
    4742    --docdir=/usr/share/doc/systemd-&systemd-version; \
     
    4944    --with-rootlibdir=/lib32 \
    5045    --enable-split-usr \
    51     --disable-gudev \
     46    --disable-firstboot \
     47    --disable-ldconfig \
     48    --disable-lto \
     49    --disable-sysusers \
     50    --with-default-dnssec=no \
    5251    --with-kbd-loadkeys=/bin/loadkeys \
    5352    --with-kbd-setfont=/bin/setfont \
    5453    --with-dbuspolicydir=/etc/dbus-1/system.d \
    55     --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
    5654    --with-dbussessionservicedir=/usr/share/dbus-1/services \
    5755    --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
    58     cc_cv_CFLAGS__flto=no</userinput></screen>
     56    --config-cache</userinput></screen>
    5957
    6058    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    7472    xpointer="xpointer(//*[@os='k'])"/>
    7573
    76     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    77     href="../common/systemd.xml"
    78     xpointer="xpointer(//*[@os='n'])"/>
    79 
    80 <screen><userinput>mv -v /usr/lib32/libnss_myhostname.so.2 /lib32</userinput></screen>
    81 
    8274  </sect2>
    8375
  • BOOK/final-system/multilib/systemd.xml

    rc831ac4 r216be86  
    2222  <sect2 role="installation">
    2323    <title>Installation of Systemd</title>
    24 
    25     <note os="mlw1">
    26       <para>If you do not have Linux-PAM installed in your system you can safely
    27       skip this page. If you do have Linux-PAM installed and you wish to use
    28       <filename class="libraryfile">pam_systemd.so</filename>
    29       to register and control user sessions within the systemd control group
    30       hierarchy, follow the instructions to install the module.</para>
    31     </note>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/systemd.xml"
    35     xpointer="xpointer(//*[@os='p1'])"/>
    36 
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/systemd.xml"
    39     xpointer="xpointer(//*[@os='p2'])"/>
    4024
    4125    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    7660make install-pkgconfiglibDATA</userinput></screen>
    7761
    78     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    79     href="../common/systemd.xml"
    80     xpointer="xpointer(//*[@os='n'])"/>
    81 
    82     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    83     href="../common/systemd.xml"
    84     xpointer="xpointer(//*[@os='o'])"/>
    85 
    8662  </sect2>
    8763
  • BOOK/introduction/common/changelog.xml

    rc831ac4 r216be86  
    4040      <itemizedlist>
    4141        <listitem>
    42           <para>[William Harrington] - Upgrade Util-Linux to 2.29.2. Fixes
     42          <para>[william harrington] - upgrade util-linux to 2.29.2. fixes
    4343          ticket <ulink url="&clfs-ticket-root;1105">#1038.</ulink></para>
     44        </listitem>
     45        <listitem>
     46          <para>[william harrington] - upgrade Systemd 233. fixes
     47          ticket <ulink url="&clfs-ticket-root;1105">#1003.</ulink></para>
    4448        </listitem>
    4549      </itemizedlist>
  • BOOK/materials/common/patches.xml

    rc831ac4 r216be86  
    142142
    143143    <varlistentry>
    144       <term>Systemd Compat Patch - <token>&systemd-compat-patch-size;</token>:</term>
    145       <listitem>
    146         <para>Download: <ulink
    147         url="&patches-root;&systemd-compat-patch;"/></para>
    148         <para>MD5 sum: <literal>&systemd-compat-patch-md5;</literal></para>
    149       </listitem>
    150     </varlistentry>
    151 
    152     <varlistentry>
    153144      <term>Sysvinit Tools Updates Patch - <token>&sysvinit-tools_updates-patch-size;</token>:</term>
    154145      <listitem>
  • BOOK/packages.ent

    rc831ac4 r216be86  
    442442<!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
    443443
    444 <!ENTITY systemd-version "213">
    445 <!ENTITY systemd-size "2,783 KB">
    446 <!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
    447 <!ENTITY systemd-md5 "06496edcf86ddf6d8c12d72ba78e735d">
     444<!ENTITY systemd-version "233">
     445<!ENTITY systemd-size "4,043 KB">
     446<!ENTITY systemd-url "http://www.linuxfromscratch.org/~krejzi/systemd/systemd-&systemd-version;.tar.xz">
     447<!ENTITY systemd-md5 "8d95734fdfcd13855746f143de1e3c86">
    448448<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
    449449
  • BOOK/patches.ent

    rc831ac4 r216be86  
    6767<!ENTITY readline-branch_update-patch-md5 "bb8d37fd00abc74a81563ebfcf64af4c">
    6868<!ENTITY readline-branch_update-patch-size "5.733 KB">
    69 
    70 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
    71 <!ENTITY systemd-compat-patch-md5 "2a5816fdfc8bd2376a40c382004ad1ac">
    72 <!ENTITY systemd-compat-patch-size "7.863 KB">
    7369
    7470<!ENTITY sysvinit-tools_updates-patch "sysvinit-&sysvinit-version;-tools_updates-1.patch">
Note: See TracChangeset for help on using the changeset viewer.