Changeset 1dd1131


Ignore:
Timestamp:
03/15/2022 04:38:23 PM (2 years ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/clfs-ng
Children:
f181345
Parents:
6ebaf1e0 (diff), f8681542 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into xry111/clfs-ng

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r6ebaf1e0 r1dd1131  
    44appendices/*.script
    55*.swp
    6 
     6fop.log

  • chapter01/changelog.xml

    r6ebaf1e0 r1dd1131  
    4444      <para>2022-03-15</para>
    4545      <itemizedlist>
     46        <listitem>
     47          <para>[bdubbs] - Update to meson-0.61.3. Fixes
     48          <ulink url="&lfs-ticket-root;5023">#5023</ulink>.</para>
     49        </listitem>
    4650        <listitem>
    4751          <para>[xry111] - Update to expat-2.4.7. Fixes
    … …  
    97101          <ulink url="&lfs-ticket-root;5015">#5015</ulink>.</para>
    98102        </listitem>
    99         <listitem>
     103        <listitem revision="systemd">
    100104          <para>[xry111] - Update to dbus-1.14.0. Fixes
    101105          <ulink url="&lfs-ticket-root;5017">#5017</ulink>.</para>

  • chapter08/systemd.xml

    r6ebaf1e0 r1dd1131  
    181181    <para>Install the man pages:</para>
    182182
    183 <screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
     183<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz -C /usr/share/man</userinput></screen>
    184184
    185185    <para>Remove a useless directory:</para>

  • packages.ent

    r6ebaf1e0 r1dd1131  
    497497<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
    498498
    499 <!ENTITY meson-version "0.61.2">
    500 <!ENTITY meson-size "1,968 KB">
     499<!ENTITY meson-version "0.61.3">
     500<!ENTITY meson-size "1,965 KB">
    501501<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    502 <!ENTITY meson-md5 "7c4220066c70057b4c5a997a47ac710c">
     502<!ENTITY meson-md5 "8998d77313d753a0c474d9bdf1738b2e">
    503503<!ENTITY meson-home "https://mesonbuild.com">
    504504<!ENTITY meson-fin-du "41 MB">
Note: See TracChangeset for help on using the changeset viewer.