Changeset f60f672


Ignore:
Timestamp:
02/07/2016 09:51:21 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
1068c0d
Parents:
248bac5
Message:

Make dbus and systemd use lfs versions.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16918 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r248bac5 rf60f672  
    6262<!ENTITY lfs-autoconf-version         "2.69">
    6363<!ENTITY lfs-coreutils-version        "8.23">
     64<!ENTITY lfs-dbus-version             "1.10.6">
    6465<!ENTITY lfs-e2fsprogs-version        "1.42.13">
    6566<!ENTITY lfs-flex-version             "2.5.39">
    … …  
    7273<!ENTITY lfs-perl-version             "&lt;5.x.y&gt;/&lt;arch-linux&gt;">
    7374<!ENTITY lfs-shadow-version           "4.2.1">
     75<!ENTITY lfs-systemd-version          "228">
    7476<!ENTITY lfs-vim-version              "7.4">
    7577<!-- End LFS versions -->

  • general/sysutils/dbus.xml

    r248bac5 rf60f672  
    55  %general-entities;
    66
    7   <!ENTITY dbus-download-http "http://dbus.freedesktop.org/releases/dbus/">
     7  <!ENTITY dbus-download-http "http://dbus.freedesktop.org/releases/dbus/dbus-&lfs-dbus-version;.tar.gz">
    88]>
    99
    … …  
    1616  </sect1info>
    1717
    18   <title>D-Bus</title>
     18  <title>D-Bus-&lfs-dbus-version;</title>
    1919
    2020  <indexterm zone="dbus">
    … …  
    3131      into LFS.
    3232    </para>
    33 
     33<!--
    3434    <para>
    3535      Unlike other packages in BLFS, there is no set version of
    … …  
    4343      installed on their system.
    4444    </para>
    45 
     45-->
    4646    &lfs78_checked;
    4747
    … …  
    5454      </listitem>
    5555    </itemizedlist>
    56 
     56<!--
    5757    <note>
    5858      <para>
    5959        If you are unsure which version needs to be downloaded, issue
    60         <command>dbus-daemon --version</command> in order to find out.
     60        <command>dbus-daemon - -version</command> in order to find out.
    6161        Some of the commands below might need the version information.
    6262        Issue the following command to store the
    … …  
    6565      </para>
    6666
    67 <screen><userinput>export DBUS_VERSION=$(dbus-daemon --version | head -n1 | awk '{print $5}')</userinput></screen>
     67<screen><userinput>export DBUS_VERSION=$(dbus-daemon - -version | head -n1 | awk '{print $5}')</userinput></screen>
    6868    </note>
    69 
     69-->
    7070    <bridgehead renderas="sect3">D-Bus Dependencies</bridgehead>
    7171
    … …  
    108108            --localstatedir=/var                 \
    109109            --with-console-auth-dir=/run/console \
    110             --docdir=/usr/share/doc/dbus-${DBUS_VERSION} &amp;&amp;
     110            --docdir=/usr/share/doc/dbus-&lfs-dbus-version; &amp;&amp;
    111111make</userinput></screen>
    112112
    … …  
    178178            --disable-static                             \
    179179            --with-console-auth-dir=/run/console/        \
    180             --docdir=/usr/share/doc/dbus-${DBUS-VERSION} &amp;&amp;
     180            --docdir=/usr/share/doc/dbus-&lfs-dbus-version; &amp;&amp;
    181181make                                                     &amp;&amp;
    182182make check</userinput></screen>

  • general/sysutils/systemd.xml

    r248bac5 rf60f672  
    55  %general-entities;
    66
    7   <!ENTITY systemd-download-http       "http://www.freedesktop.org/software/systemd/">
    8   <!ENTITY systemd-patch-download-http "http://www.linuxfromscratch.org/patches/downloads/systemd/">
     7  <!ENTITY systemd-download-http       "http://anduin.linuxfromscratch.org/sources/other/systemd/systemd-&lfs-systemd-version;.tar.xz">
     8  <!ENTITY systemd-patch-download-http "http://www.linuxfromscratch.org/patches/downloads/systemd/systemd-&lfs-systemd-version;-compat-1.patch">
    99]>
    1010
    … …  
    1717  </sect1info>
    1818
    19   <title>Systemd</title>
     19  <title>Systemd-&lfs-systemd-version;</title>
    2020
    2121  <indexterm zone="systemd">
    … …  
    5656    <para>
    5757      This package is known to build and work properly using an
    58       LFS-7.8 systemd platform using systemd-224 source.
     58      LFS-&lfs-version; platform using systemd-228 source.
    5959    </para>
    6060
    … …  
    6868      </listitem>
    6969    </itemizedlist>
    70 
     70<!--
    7171    <para>
    7272      Make sure you download the "compat" patch whose version matches
    … …  
    7777      <para>
    7878        If you are unsure which version needs to be downloaded, issue
    79         <command>systemctl --version</command> in order to find out.
     79        <command>systemctl - -version</command> in order to find out.
    8080        Some of the commands below might need the version information.
    8181        Issue the following command to store the
    … …  
    8484      </para>
    8585
    86 <screen><userinput>export SYSTEMD_VERSION=$(systemctl --version | head -n1 | awk '{print $2}')</userinput></screen>
     86<screen><userinput>export SYSTEMD_VERSION=$(systemctl - -version | head -n1 | awk '{print $2}')</userinput></screen>
    8787    </note>
    88 
     88-->
    8989    <bridgehead renderas="sect3">systemd Dependencies</bridgehead>
    9090
    … …  
    159159    </para>
    160160
    161 <screen><userinput>patch -Np1 -i ../systemd-${SYSTEMD_VERSION}-compat-1.patch</userinput></screen>
    162 
     161<screen><userinput>patch -Np1 -i ../systemd-&lfs-systemd-version;-compat-1.patch &amp;&amp;
     162autoreconf -fi</userinput></screen>
     163<!--
    163164    <para>
    164165      Additionally, apply any patch that is also applied in LFS.
    165166    </para>
    166 
     167-->
    167168    <para>
    168169      Disable two tests that always fail:
    … …  
    189190            --disable-sysusers     \
    190191            --without-python       \
    191             --docdir=/usr/share/doc/systemd-${SYSTEMD_VERSION} &amp;&amp;
     192            --docdir=/usr/share/doc/systemd-&lfs-systemd-version; &amp;&amp;
    192193make</userinput></screen>
    193194

  • introduction/welcome/changelog.xml

    r248bac5 rf60f672  
    4848      <itemizedlist>
    4949        <listitem>
     50          <para>[dj] - Use LFS D-Bus version.</para>
     51        </listitem>
     52        <listitem>
     53          <para>[dj] - Use LFS systemd version and patch.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[dj] - Added systemd to the Important reinstall box on the
     57          Linux-Pam page.</para>
     58        </listitem>
     59        <listitem>
    5060          <para>[dj] - Update to openldap-2.4.44. Merged from trunk
    5161          r16912.</para>

  • postlfs/security/linux-pam.xml

    r248bac5 rf60f672  
    376376      <important>
    377377        <para>
    378           You should now reinstall the <xref linkend="shadow"/>
    379           package.
     378          You should now reinstall the <xref linkend="shadow"/> and
     379          <xref linkend="systemd"/> packages.
    380380        </para>
    381381      </important>
Note: See TracChangeset for help on using the changeset viewer.