Changeset b2c61c6


Ignore:
Timestamp:
03/31/2021 10:41:35 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
be00729f
Parents:
5066dee
git-author:
Thomas Trepl <thomas@…> (07/03/2019 05:47:21 AM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:35 AM)
Message:

MultiLib: Merge changes from trunk

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

Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r5066dee rb2c61c6  
    203203                $(RENDERTMP)/sysv-md5sum.xml
    204204        $(Q)sed -i -e \
    205        "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
     205       "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \
    206206       $(BASEDIR)/md5sums
    207207

  • aux-file-data.sh

    r5066dee rb2c61c6  
    1111
    1212# Bootscript data
    13 bootscripts=$(ls lfs-bootscripts*.bz2)
    14 base=$(basename $bootscripts .tar.bz2)
     13bootscripts=$(ls lfs-bootscripts*.xz)
     14base=$(basename $bootscripts .tar.xz)
    1515bootsize=$(ls -l --block-size=1024 $bootscripts | cut -f5 -d" ")
    1616bootmd5=$(md5sum $bootscripts | cut -f1 -d" ")

  • chapter01/changelog.xml

    r5066dee rb2c61c6  
    4646       -->
    4747    <listitem>
     48      <para>2019-06-24</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[renodr] - Fixed issue with installing Check's documentation
     52          in a verisoned directory. Thanks goes to Ryan Marsaw for the report.
     53          This was fixed be removing the unrecognized/unused --docdir
     54          and replacing it with a "docdir=" in the make install command.</para>
     55        </listitem>
     56      </itemizedlist>
     57    </listitem>
     58
     59    <listitem>
     60      <para>2019-06-16</para>
     61      <itemizedlist>
     62        <listitem>
     63          <para>[bdubbs] - Properly initialize a data structure in
     64          OpenSSL to avoid valgrind uninitialized value errors. Fixes
     65          <ulink url="&lfs-ticket-root;4491">#4491</ulink>.</para>
     66        </listitem>
     67        <listitem>
     68          <para>[bdubbs] - Update to meson-0.51.0. Fixes
     69          <ulink url="&lfs-ticket-root;4483">#4483</ulink>.</para>
     70        </listitem>
     71        <listitem>
     72          <para>[bdubbs] - Update to gawk-5.0.1. Fixes
     73          <ulink url="&lfs-ticket-root;4486">#4486</ulink>.</para>
     74        </listitem>
     75        <listitem>
     76          <para>[bdubbs] - Update to expat-2.2.7. Fixes
     77          <ulink url="&lfs-ticket-root;4488">#4488</ulink>.</para>
     78        </listitem>
     79        <listitem>
     80          <para>[bdubbs] - Update to linux-5.1.15. Fixes
     81          <ulink url="&lfs-ticket-root;4487">#4487</ulink>.</para>
     82        </listitem>
     83        <listitem revision="sysv">
     84          <para>[bdubbs] - Update to sysvinit-2.95. Fixes
     85          <ulink url="&lfs-ticket-root;4484">#4484</ulink>.</para>
     86        </listitem>
     87        <listitem>
     88          <para>[bdubbs] - Update to bzip2-1.0.7. Fixes
     89          <ulink url="&lfs-ticket-root;4490">#4490</ulink>.</para>
     90        </listitem>
     91      </itemizedlist>
     92    </listitem>
     93
     94    <listitem>
    4895      <para>2019-06-18</para>
    4996      <itemizedlist>
    … …  
    71118          <ulink url="&lfs-ticket-root;4478">#4478</ulink>.</para>
    72119        </listitem>
    73         <listitem revision="sysv">
     120        <listitem>
    74121          <para>[bdubbs] - Update to less-551. Fixes
    75122          <ulink url="&lfs-ticket-root;4477">#4477</ulink>.</para>

  • chapter01/whatsnew.xml

    r5066dee rb2c61c6  
    5151      <para>Bison-&bison-version;</para>
    5252    </listitem>
    53     <!--<listitem>
     53    <listitem>
    5454      <para>Bzip2-&bzip2-version;</para>
    55     </listitem>-->
     55    </listitem>
    5656    <!--<listitem>
    5757      <para>Check-&check-version;</para>
    … …  
    7575      <para>Eudev-&eudev-version;</para>
    7676   </listitem>
    77    <!--<listitem>
     77   <listitem>
    7878      <para>Expat-&expat-version;</para>
    79    </listitem>-->
     79   </listitem>
    8080   <!-- <listitem>
    8181      <para>Expect-&expect-version;</para>

  • chapter06/check.xml

    r5066dee rb2c61c6  
    4343    <para>Prepare Check for compilation:</para>
    4444
    45 <screen><userinput remap="configure">./configure --prefix=/usr \
    46             --docdir=/usr/share/doc/check-&check-version;</userinput></screen>
     45<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
    4746
    4847    <para>Build the package:</para>
    … …  
    6059    <para>Install the package and fix a script:</para>
    6160
    62 <screen><userinput remap="install">make install
     61    <screen><userinput remap="install">make docdir=/usr/share/doc/check-&check-version; install
    6362sed -i '1 s/tools/usr/' /usr/bin/checkmk</userinput></screen>
    6463

  • chapter06/libtool.xml

    r5066dee rb2c61c6  
    5151<screen><userinput remap="make">make</userinput></screen>
    5252
    53     <para>To test the results (about 11.0 SBU), issue:</para>
     53<para>To test the results<!--(about 11.0 SBU)-->, issue:</para>
    5454
    5555<screen><userinput remap="test">make check</userinput></screen>

  • chapter06/openssl.xml

    r5066dee rb2c61c6  
    4343  <sect2 role="installation">
    4444    <title>Installation of OpenSSL</title>
     45
     46    <para>First, fix a problem identified upstream:</para>
     47
     48<screen><userinput remap="pre">sed -i '/\} data/s/ =.*$/;\n    memset(\&amp;data, 0, sizeof(data));/' \
     49  crypto/rand/rand_lib.c</userinput></screen>
    4550
    4651    <para>Prepare OpenSSL for compilation:</para>

  • general.ent

    r5066dee rb2c61c6  
    1 <!ENTITY version         "SVN-20190618">
     1<!ENTITY version         "SVN-20190629">
    22<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
    33                                      Change to x.y for release but not -rc releases -->
    44<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    55
    6 <!ENTITY versiond        "20190618-systemd">
     6<!ENTITY versiond        "20190629-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "June 18, 2019">
     10<!ENTITY releasedate     "June 29, 2019">
    1111
    1212<!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->

  • make-aux-files.sh

    r5066dee rb2c61c6  
    11#!/bin/bash
    22
    3 rm -f lfs-bootscripts*.tar.bz2
     3rm -f lfs-bootscripts*.tar.?z*
    44
    55# Get base file name and move bootscripts directory to that name
    … …  
    88
    99# Create the tarball and clean up
    10 tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version
     10tar -cJf lfs-bootscripts-$version.tar.xz --exclude .svn lfs-bootscripts-$version
    1111mv lfs-bootscripts-$version bootscripts
    1212

  • packages.ent

    r5066dee rb2c61c6  
    8181<!ENTITY bison-ch6-sbu "0.3 SBU">
    8282
    83 <!ENTITY bzip2-version "1.0.6">
    84 <!ENTITY bzip2-size "764 KB">
     83<!ENTITY bzip2-version "1.0.7">
     84<!ENTITY bzip2-size "791 KB">
    8585<!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz">
    86 <!ENTITY bzip2-md5 "00b516f4704d4a7cb50a1d97e6e8e15b">
     86<!ENTITY bzip2-md5 "1a6a61cc867be4f3d6549037a09bf13e">
    8787<!--<!ENTITY bzip2-home "http://www.bzip.org/">-->
    8888<!ENTITY bzip2-ch5-du "5.5 MB">
    … …  
    168168<!ENTITY eudev-ch6-sbu "0.2 SBU">
    169169
    170 <!ENTITY expat-version "2.2.6">
    171 <!ENTITY expat-size "502 KB">
    172 <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.bz2">
    173 <!ENTITY expat-md5 "ca047ae951b40020ac831c28859161b2">
     170<!ENTITY expat-version "2.2.7">
     171<!ENTITY expat-size "415 KB">
     172<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
     173<!ENTITY expat-md5 "3659bc0938db78815b5f5a9c24d732aa">
    174174<!ENTITY expat-home "https://libexpat.github.io/">
    175175<!ENTITY expat-ch6-du "11 MB">
    … …  
    213213<!ENTITY flex-ch6-sbu "0.4 SBU">
    214214
    215 <!ENTITY gawk-version "5.0.0">
    216 <!ENTITY gawk-size "2,931 KB">
     215<!ENTITY gawk-version "5.0.1">
     216<!ENTITY gawk-size "3,063 KB">
    217217<!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
    218 <!ENTITY gawk-md5 "129d061e362778cad070d1bbfe2b1183">
     218<!ENTITY gawk-md5 "f9db3f6715207c6f13719713abc9c707">
    219219<!ENTITY gawk-home "&gnu-software;gawk/">
    220220<!ENTITY gawk-ch5-du "43 MB">
    … …  
    392392<!ENTITY lfs-bootscripts-version "20190524">      <!-- Scripts depend on this format -->
    393393<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">       
    394 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
     394<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
    395395<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> 
    396396<!ENTITY lfs-bootscripts-home " ">
    … …  
    432432<!ENTITY linux-major-version "5">
    433433<!ENTITY linux-minor-version "1">
    434 <!ENTITY linux-patch-version "11">
     434<!ENTITY linux-patch-version "15">
    435435<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    436436<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    437 <!ENTITY linux-size "103,772 KB">
     437<!ENTITY linux-size "103,784 KB">
    438438<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    439 <!ENTITY linux-md5 "4f1eda4b7f6a4a6e2d66563cba307ce8">
     439<!ENTITY linux-md5 "373a50ac09f662469fe1c699b2cb2520">
    440440<!ENTITY linux-home "https://www.kernel.org/">
    441441<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
    … …  
    469469
    470470<!ENTITY make-version "4.2.1">
    471 <!ENTITY make-size "1,375 KB">
    472 <!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
    473 <!ENTITY make-md5 "15b012617e7c44c0ed482721629577ac">
     471<!ENTITY make-size "1,932 KB">
     472<!ENTITY make-url "&gnu;make/make-&make-version;.tar.gz">
     473<!ENTITY make-md5 "7d0dcb6c474b258aab4d54098f2cf5a7">
    474474<!ENTITY make-home "&gnu-software;make/">
    475475<!ENTITY make-ch5-du "13 MB">
    … …  
    494494<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
    495495
    496 <!ENTITY meson-version "0.50.1">
    497 <!ENTITY meson-size "1,370 KB">
     496<!ENTITY meson-version "0.51.0">
     497<!ENTITY meson-size "1,416 KB">
    498498<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    499 <!ENTITY meson-md5 "24a6527796115828d2ebc75880e18d62">
     499<!ENTITY meson-md5 "a091995861e0bc23e3c856b0c8d1ef90">
    500500<!ENTITY meson-home "https://mesonbuild.com">
    501501<!ENTITY meson-ch6-du "24 MB">
    … …  
    655655<!ENTITY systemd-ch6-sbu  "2.4 SBU">
    656656
    657 <!ENTITY sysvinit-version "2.94">
    658 <!ENTITY sysvinit-size "119 KB">
     657<!ENTITY sysvinit-version "2.95">
     658<!ENTITY sysvinit-size "122 KB">
    659659<!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
    660 <!ENTITY sysvinit-md5 "885ae742d51dbae8d16f535455c0240a">
     660<!ENTITY sysvinit-md5 "66f488c952c70ff4245774fc7e87e529">
    661661<!ENTITY sysvinit-home "https://savannah.nongnu.org/projects/sysvinit">
    662662<!ENTITY sysvinit-ch6-du "1.3 MB">
    … …  
    700700<!ENTITY udev-lfs-version "udev-lfs-20171102">
    701701<!ENTITY udev-lfs-size    "11 KB">
    702 <!ENTITY udev-lfs-url     "&anduin-sources;/&udev-lfs-version;.tar.bz2">
    703 <!ENTITY udev-lfs-md5     "d92afb0c6e8e616792068ee4737b0d24">
     702<!ENTITY udev-lfs-url     "&anduin-sources;/&udev-lfs-version;.tar.xz">
     703<!ENTITY udev-lfs-md5     "27cd82f9a61422e186b9d6759ddf1634">
    704704<!ENTITY udev-lfs-home    " ">
    705705

  • patches.ent

    r5066dee rb2c61c6  
    5454<!ENTITY ninja-limit-jobs-patch-size "2.5 KB">
    5555-->
    56 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-4.patch">
     56<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
    5757<!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
    5858<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
Note: See TracChangeset for help on using the changeset viewer.