Changeset a3df607


Ignore:
Timestamp:
06/19/2019 06:19:25 PM (5 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
Children:
5839010
Parents:
5d327ae
Message:

MultiLib: Merge changes from trunk

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

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r5d327ae ra3df607  
    4444    <listitem revision="sysv"> or <listitem revision="systemd"> as
    4545    appropriate for the entry or if needed the entire day's listitem.
    46     -->
     46       -->
     47    <listitem>
     48      <para>2019-06-18</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[renodr] - Update to linux-5.1.11. Fixes the SOCK PANIC
     52          issue. Fixes
     53          <ulink url="&lfs-ticket-root;4485">#4485</ulink>.</para>
     54        </listitem>
     55      </itemizedlist>
     56    </listitem>
     57
     58    <listitem>
     59      <para>2019-06-16</para>
     60      <itemizedlist>
     61        <listitem>
     62          <para>[bdubbs] - Update to vim-8.1.1535. Fixes
     63          <ulink url="&lfs-ticket-root;4482">#4482</ulink>.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[bdubbs] - Update to shadow-4.7. Fixes
     67          <ulink url="&lfs-ticket-root;4481">#4481</ulink>.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[bdubbs] - Update to linux-5.1.10. Fixes
     71          <ulink url="&lfs-ticket-root;4478">#4478</ulink>.</para>
     72        </listitem>
     73        <listitem revision="sysv">
     74          <para>[bdubbs] - Update to less-551. Fixes
     75          <ulink url="&lfs-ticket-root;4477">#4477</ulink>.</para>
     76        </listitem>
     77        <listitem>
     78          <para>[bdubbs] - Update to util-linux-2.34. Fixes
     79          <ulink url="&lfs-ticket-root;4452">#4462</ulink>.</para>
     80        </listitem>
     81        <listitem>
     82          <para>[bdubbs] - Remove eudev instructions referring to /tools. Fixes
     83          <ulink url="&lfs-ticket-root;4480">#4480</ulink>.</para>
     84        </listitem>
     85      </itemizedlist>
     86    </listitem>
     87
    4788    <listitem revision="systemd">
    4889      <para>2019-06-12</para>

  • chapter01/whatsnew.xml

    r5d327ae ra3df607  
    141141      <para>Kmod-&kmod-version;</para>
    142142   </listitem>-->
    143    <!--<listitem>
     143   <listitem>
    144144      <para>Less-&less-version;</para>
    145    </listitem>-->
     145   </listitem>
    146146    <listitem>
    147147      <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
    … …  
    219219      <para>Sed-&sed-version;</para>
    220220    </listitem>-->
    221     <!--<listitem>
     221    <listitem>
    222222      <para>Shadow-&shadow-version;</para>
    223     </listitem>-->
     223    </listitem>
    224224    <!--<listitem revision="sysv">
    225225      <para>Sysklogd-&sysklogd-version;</para>
    … …  
    246246      <para>Util-Linux-&util-linux-version;</para>
    247247   </listitem>
    248     <!--<listitem>
     248    <listitem>
    249249      <para>Vim-&vim-version;</para>
    250     </listitem>-->
     250    </listitem>
    251251    <!--<listitem>
    252252      <para>XML-Parser-&xml-parser-version;</para>

  • chapter05/gcc-pass1.xml

    r5d327ae ra3df607  
    8888  sed -e 's@/lib\(64\)\?\(32\)\?\(x32\)\?/ld@/tools&amp;@g' \
    8989      -e 's@/usr@/tools@g' $file.orig &gt; $file
    90   echo '
    91 #undef STANDARD_STARTFILE_PREFIX_1
    92 #undef STANDARD_STARTFILE_PREFIX_2
    93 #define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"
    94 #define STANDARD_STARTFILE_PREFIX_2 ""' &gt;&gt; $file
    9590  touch $file.orig
    96 done</userinput></screen>
     91done
     92sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/\";" \
     93    -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_2/ s;\".*\";\"\";" \
     94    -i gcc/gcc.c</userinput></screen>
    9795
    9896    <para>In case the above seems hard to follow, let's break it down a bit.

  • chapter05/gcc-pass2.xml

    r5d327ae ra3df607  
    7676  sed -e 's@/lib\(64\)\?\(32\)\?\(x32\)\?/ld@/tools&amp;@g' \
    7777      -e 's@/usr@/tools@g' $file.orig &gt; $file
    78   echo '
    79 #undef STANDARD_STARTFILE_PREFIX_1
    80 #undef STANDARD_STARTFILE_PREFIX_2
    81 #define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"
    82 #define STANDARD_STARTFILE_PREFIX_2 ""' &gt;&gt; $file
    8378  touch $file.orig
    84 done</userinput></screen>
     79done
     80sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/\";" \
     81    -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_2/ s;\".*\";\"\";" \
     82    -i gcc/gcc.c</userinput></screen>
    8583
    8684    <para arch="default">If building on x86_64, change the default directory

  • chapter06/eudev.xml

    r5d327ae ra3df607  
    5050<screen><userinput remap="pre">sed -i '/keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c</userinput></screen>
    5151-->
     52<!--
    5253    <para>First, add a workaround to prevent the /tools directory from being
    5354    hard coded into Eudev binary files library locations:</para>
    … …  
    5859BLKID_CFLAGS="-I/tools/include"
    5960EOF</userinput></screen>
    60 
     61-->
    6162<para>Prepare Eudev for compilation:</para>
    6263
    … …  
    7071            --with-rootlibdir=/lib  \
    7172            --enable-manpages       \
    72             --disable-static        \
    73             --config-cache</userinput></screen>
     73            --disable-static</userinput></screen>
     74<!--           - -config-cache</userinput></screen> -->
    7475
    7576<para>Compile the package:</para>
    7677
     78<screen><userinput remap="make">make</userinput></screen>
     79<!--
    7780<screen><userinput remap="make">LIBRARY_PATH=/tools/lib make</userinput></screen>
    7881
    … …  
    8285used to find libraries during the linking process.  LD_LIBRARY_PATH is
    8386used to find libraries during program execution.</para></note>
    84 
     87-->
    8588<para>Create some directories now that are needed for tests, but
    8689will also be used as a part of installation:</para>
    … …  
    9194<para>To test the results, issue:</para>
    9295
    93 <screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
     96<screen><userinput remap="test">make check</userinput></screen>
     97<!--<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
    9498
    9599    <para>Install the package:</para>
    96100
    97 <screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>
     101<screen><userinput remap="install">make install</userinput></screen>
     102<!--<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>-->
    98103
    99104    <para>Install some custom rules and support files useful in an LFS
    … …  
    197202    initial database:</para>
    198203
    199 <screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb --update</userinput></screen>
     204<!--<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb - -update</userinput></screen>-->
     205<screen><userinput>udevadm hwdb --update</userinput></screen>
    200206
    201207    <para>This command needs to be run each time the hardware information is

  • chapter06/vim.xml

    r5d327ae ra3df607  
    6767<screen><userinput remap="make">make</userinput></screen>
    6868
    69     <para>To test the results, issue:</para>
    70 
    71 <screen><userinput remap="test">LANG=en_US.UTF-8 make -j1 test &amp;&gt; vim-test.log</userinput></screen>
     69    <para>To prepare the tests, ensure that the
     70    <systemitem class="username">nobody</systemitem> user can write
     71    to the sources tree:</para>
     72
     73<screen><userinput remap="test">chown -Rv nobody .</userinput></screen>
     74
     75    <para>Now run the tests as the <systemitem
     76    class="username">nobody</systemitem> user:</para>
     77
     78<screen><userinput remap="test">su nobody -s /bin/bash -c "LANG=en_US.UTF-8 make -j1 test" &amp;> vim-test.log</userinput></screen>
     79
     80<!--<screen><userinput remap="test">LANG=en_US.UTF-8 make -j1 test &amp;&gt; vim-test.log</userinput></screen>-->
    7281
    7382    <para>The test suite outputs a lot of binary data to the screen.  This can

  • general.ent

    r5d327ae ra3df607  
    1 <!ENTITY version         "SVN-20190612">
     1<!ENTITY version         "SVN-20190618">
    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        "20190612-systemd">
     6<!ENTITY versiond        "20190618-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "June 12, 2019">
     10<!ENTITY releasedate     "June 18, 2019">
    1111
    1212<!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->

  • lfs-latest.php

    r5d327ae ra3df607  
    105105  global $regex;
    106106
    107 //if ( $package != "expat" ) return 0; // Debug
     107//if ( $package != "vim" ) return 0; // Debug
    108108
    109109if ( $package == "check"      ) $dirpath = "https://github.com/libcheck/check/releases";
    … …  
    126126if ( $package == "tcl"        ) $dirpath = "http://sourceforge.net/projects/tcl/files";
    127127if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." );
    128 if ( $package == "vim"        ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
     128if ( $package == "vim"        ) $dirpath = "https://github.com/vim/vim/releases";
     129//if ( $package == "vim"        ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
    129130
    130131  // Check for ftp
    … …  
    279280     return find_max( $lines, "/openssl/", "/^.*openssl-([\d\.p]*\d.?).tar.*$/" );
    280281
     282  if ( $package == "vim" )
     283     return find_max( $lines, "/v\d\./", "/^.*v([\d\.]+).*$/" );
     284
    281285  // Most packages are in the form $package-n.n.n
    282286  // Occasionally there are dashes (e.g. 201-1)

  • packages.ent

    r5d327ae ra3df607  
    382382<!ENTITY kmod-ch6-sbu "0.1 SBU">
    383383
    384 <!ENTITY less-version "530">
    385 <!ENTITY less-size "332 KB">
     384<!ENTITY less-version "551">
     385<!ENTITY less-size "339 KB">
    386386<!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
    387 <!ENTITY less-md5 "6a39bccf420c946b0fd7ffc64961315b">
     387<!ENTITY less-md5 "4ad4408b06d7a6626a055cb453f36819">
    388388<!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
    389389<!ENTITY less-ch6-du "3.9 MB">
    … …  
    432432<!ENTITY linux-major-version "5">
    433433<!ENTITY linux-minor-version "1">
    434 <!ENTITY linux-patch-version "6">
     434<!ENTITY linux-patch-version "11">
    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,771 KB">
     437<!ENTITY linux-size "103,772 KB">
    438438<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    439 <!ENTITY linux-md5 "252fe34c28205fcaaa6b1b3782576b84">
     439<!ENTITY linux-md5 "4f1eda4b7f6a4a6e2d66563cba307ce8">
    440440<!ENTITY linux-home "https://www.kernel.org/">
    441441<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
    … …  
    623623<!ENTITY sed-ch6-sbu "0.3 SBU">
    624624
    625 <!ENTITY shadow-version "4.6">
    626 <!ENTITY shadow-size "1,639 KB">
     625<!ENTITY shadow-version "4.7">
     626<!ENTITY shadow-size "1,587 KB">
    627627<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
    628 <!ENTITY shadow-md5 "b491fecbf1232632c32ff8f1437fd60e">
     628<!ENTITY shadow-md5 "f7ce18c8dfd05f1a009266cb604d58b7">
    629629<!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/">
    630630<!ENTITY shadow-ch6-du "46 MB">
    … …  
    704704<!ENTITY udev-lfs-home    " ">
    705705
    706 <!ENTITY util-linux-minor "2.33">
    707 <!ENTITY util-linux-version "2.33.2"> <!-- 2.33.x -->
    708 <!ENTITY util-linux-size "4,597 KB">
     706<!ENTITY util-linux-minor "2.34">
     707<!ENTITY util-linux-version "2.34"> <!-- 2.33.x -->
     708<!ENTITY util-linux-size "4,859 KB">
    709709<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
    710 <!ENTITY util-linux-md5 "91653b90fcbe9c161153e39b8cc69fb5">
     710<!ENTITY util-linux-md5 "a78cbeaed9c39094b96a48ba8f891d50">
    711711<!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
    712712<!ENTITY util-linux-ch5-du "147 MB">
    … …  
    715715<!ENTITY util-linux-ch6-sbu "1.5 SBU">
    716716
    717 <!ENTITY vim-version "8.1">
     717<!ENTITY vim-version "8.1.1535">
    718718<!ENTITY vim-majmin "81">
    719719<!ENTITY vim-docdir "vim/vim81">
    720 <!ENTITY vim-size "10,995 KB">
    721 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
    722 <!ENTITY vim-md5 "1739a1df312305155285f0cfa6118294">
     720<!ENTITY vim-size "14,028 KB">
     721<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
     722<!ENTITY vim-md5 "95935d54145e03a1c5a499bb3712817d">
    723723<!ENTITY vim-home "https://www.vim.org">
    724724<!ENTITY vim-ch6-du "169 MB">
Note: See TracChangeset for help on using the changeset viewer.