gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-06 06:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

MultiLib: Merge changes from trunk

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11623 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2019-06-19 18:19:25 +00:00 committed by Xℹ Ruoyao
parent 1803e9b375
commit 5066dee828
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
9 changed files with 106 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
chapter01/changelog.xml
View File

@ -43,7 +43,48 @@
Note: If a change is only specific to sysv or systemd, then use
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
-->
<listitem>
<para>2019-06-18</para>
<itemizedlist>
<listitem>
<para>[renodr] - Update to linux-5.1.11. Fixes the SOCK PANIC
issue. Fixes
<ulink url="&lfs-ticket-root;4485">#4485</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2019-06-16</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to vim-8.1.1535. Fixes
<ulink url="&lfs-ticket-root;4482">#4482</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to shadow-4.7. Fixes
<ulink url="&lfs-ticket-root;4481">#4481</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.1.10. Fixes
<ulink url="&lfs-ticket-root;4478">#4478</ulink>.</para>
</listitem>
<listitem revision="sysv">
<para>[bdubbs] - Update to less-551. Fixes
<ulink url="&lfs-ticket-root;4477">#4477</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to util-linux-2.34. Fixes
<ulink url="&lfs-ticket-root;4452">#4462</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Remove eudev instructions referring to /tools. Fixes
<ulink url="&lfs-ticket-root;4480">#4480</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem revision="systemd">
<para>2019-06-12</para>
<itemizedlist>

12
chapter01/whatsnew.xml
View File

@ -140,9 +140,9 @@
<!--<listitem>
<para>Kmod-&kmod-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Less-&less-version;</para>
</listitem>-->
</listitem>
<listitem>
<para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
</listitem>
@ -218,9 +218,9 @@
<!--<listitem>
<para>Sed-&sed-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Shadow-&shadow-version;</para>
</listitem>-->
</listitem>
<!--<listitem revision="sysv">
<para>Sysklogd-&sysklogd-version;</para>
</listitem>-->
@ -245,9 +245,9 @@
<listitem>
<para>Util-Linux-&util-linux-version;</para>
</listitem>
<!--<listitem>
<listitem>
<para>Vim-&vim-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>XML-Parser-&xml-parser-version;</para>
</listitem>-->

10
chapter05/gcc-pass1.xml
View File

@ -87,13 +87,11 @@ do
cp -uv $file{,.orig}
sed -e 's@/lib\(64\)\?\(32\)\?\(x32\)\?/ld@/tools&amp;@g' \
-e 's@/usr@/tools@g' $file.orig &gt; $file
echo '
#undef STANDARD_STARTFILE_PREFIX_1
#undef STANDARD_STARTFILE_PREFIX_2
#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"
#define STANDARD_STARTFILE_PREFIX_2 ""' &gt;&gt; $file
touch $file.orig
done</userinput></screen>
done
sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/\";" \
-e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_2/ s;\".*\";\"\";" \
-i gcc/gcc.c</userinput></screen>
<para>In case the above seems hard to follow, let's break it down a bit.
First we copy the files <filename>gcc/config/linux.h</filename>,

10
chapter05/gcc-pass2.xml
View File

@ -75,13 +75,11 @@ do
cp -uv $file{,.orig}
sed -e 's@/lib\(64\)\?\(32\)\?\(x32\)\?/ld@/tools&amp;@g' \
-e 's@/usr@/tools@g' $file.orig &gt; $file
echo '
#undef STANDARD_STARTFILE_PREFIX_1
#undef STANDARD_STARTFILE_PREFIX_2
#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"
#define STANDARD_STARTFILE_PREFIX_2 ""' &gt;&gt; $file
touch $file.orig
done</userinput></screen>
done
sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/\";" \
-e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_2/ s;\".*\";\"\";" \
-i gcc/gcc.c</userinput></screen>
<para arch="default">If building on x86_64, change the default directory
name for 64-bit libraries to <quote>lib</quote>:</para>

20
chapter06/eudev.xml
View File

@ -49,6 +49,7 @@
<screen><userinput remap="pre">sed -i '/keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c</userinput></screen>
-->
<!--
<para>First, add a workaround to prevent the /tools directory from being
hard coded into Eudev binary files library locations:</para>
@ -57,7 +58,7 @@ HAVE_BLKID=1
BLKID_LIBS="-lblkid"
BLKID_CFLAGS="-I/tools/include"
EOF</userinput></screen>
-->
<para>Prepare Eudev for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
@ -69,11 +70,13 @@ EOF</userinput></screen>
--with-rootprefix= \
--with-rootlibdir=/lib \
--enable-manpages \
--disable-static \
--config-cache</userinput></screen>
--disable-static</userinput></screen>
<!-- - -config-cache</userinput></screen> -->
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>
<!--
<screen><userinput remap="make">LIBRARY_PATH=/tools/lib make</userinput></screen>
<note><para>The LIBRARY_PATH variable here and the LD_LIBRARY_PATH variable
@ -81,7 +84,7 @@ below are needed to allow the use of libraries that were installed in /tools,
but have not yet been installed in the main system. LIBRARY_PATH is
used to find libraries during the linking process. LD_LIBRARY_PATH is
used to find libraries during program execution.</para></note>
-->
<para>Create some directories now that are needed for tests, but
will also be used as a part of installation:</para>
@ -90,11 +93,13 @@ mkdir -pv /etc/udev/rules.d</userinput></screen>
<para>To test the results, issue:</para>
<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
<screen><userinput remap="test">make check</userinput></screen>
<!--<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
<para>Install the package:</para>
<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>
<screen><userinput remap="install">make install</userinput></screen>
<!--<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>-->
<para>Install some custom rules and support files useful in an LFS
environment:</para>
@ -196,7 +201,8 @@ rm -rf DESTDIR</userinput></screen>
into a binary database <filename>/etc/udev/hwdb.bin</filename>. Create the
initial database:</para>
<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb --update</userinput></screen>
<!--<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb - -update</userinput></screen>-->
<screen><userinput>udevadm hwdb --update</userinput></screen>
<para>This command needs to be run each time the hardware information is
updated.</para>

13
chapter06/vim.xml
View File

@ -66,9 +66,18 @@
<screen><userinput remap="make">make</userinput></screen>
<para>To test the results, issue:</para>
<para>To prepare the tests, ensure that the
<systemitem class="username">nobody</systemitem> user can write
to the sources tree:</para>
<screen><userinput remap="test">LANG=en_US.UTF-8 make -j1 test &amp;&gt; vim-test.log</userinput></screen>
<screen><userinput remap="test">chown -Rv nobody .</userinput></screen>
<para>Now run the tests as the <systemitem
class="username">nobody</systemitem> user:</para>
<screen><userinput remap="test">su nobody -s /bin/bash -c "LANG=en_US.UTF-8 make -j1 test" &amp;> vim-test.log</userinput></screen>
<!--<screen><userinput remap="test">LANG=en_US.UTF-8 make -j1 test &amp;&gt; vim-test.log</userinput></screen>-->
<para>The test suite outputs a lot of binary data to the screen. This can
cause issues with the settings of the current terminal. The problem can be

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20190612">
<!ENTITY version "SVN-20190618">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY versiond "20190612-systemd">
<!ENTITY versiond "20190618-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "June 12, 2019">
<!ENTITY releasedate "June 18, 2019">
<!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.5">

8
lfs-latest.php
View File

@ -104,7 +104,7 @@ function get_packages( $package, $dirpath )
global $exceptions;
global $regex;
//if ( $package != "expat" ) return 0; // Debug
//if ( $package != "vim" ) return 0; // Debug
if ( $package == "check" ) $dirpath = "https://github.com/libcheck/check/releases";
if ( $package == "e2fsprogs" ) $dirpath = "http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs";
@ -125,7 +125,8 @@ if ( $package == "shadow" ) $dirpath = "https://github.com/shadow-maint/shad
if ( $package == "systemd" ) $dirpath = "https://github.com/systemd/systemd/releases";
if ( $package == "tcl" ) $dirpath = "http://sourceforge.net/projects/tcl/files";
if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." );
if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
if ( $package == "vim" ) $dirpath = "https://github.com/vim/vim/releases";
//if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
// Check for ftp
if ( preg_match( "/^ftp/", $dirpath ) )
@ -278,6 +279,9 @@ if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
if ( $package == "openssl" )
return find_max( $lines, "/openssl/", "/^.*openssl-([\d\.p]*\d.?).tar.*$/" );
if ( $package == "vim" )
return find_max( $lines, "/v\d\./", "/^.*v([\d\.]+).*$/" );
// Most packages are in the form $package-n.n.n
// Occasionally there are dashes (e.g. 201-1)
return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d)\.tar.*$/" );

34
packages.ent
View File

@ -381,10 +381,10 @@
<!ENTITY kmod-ch6-du "13 MB">
<!ENTITY kmod-ch6-sbu "0.1 SBU">
<!ENTITY less-version "530">
<!ENTITY less-size "332 KB">
<!ENTITY less-version "551">
<!ENTITY less-size "339 KB">
<!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
<!ENTITY less-md5 "6a39bccf420c946b0fd7ffc64961315b">
<!ENTITY less-md5 "4ad4408b06d7a6626a055cb453f36819">
<!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
<!ENTITY less-ch6-du "3.9 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
@ -431,12 +431,12 @@
<!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "1">
<!ENTITY linux-patch-version "6">
<!ENTITY linux-patch-version "11">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "103,771 KB">
<!ENTITY linux-size "103,772 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "252fe34c28205fcaaa6b1b3782576b84">
<!ENTITY linux-md5 "4f1eda4b7f6a4a6e2d66563cba307ce8">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
@ -622,10 +622,10 @@
<!ENTITY sed-ch6-du "32 MB">
<!ENTITY sed-ch6-sbu "0.3 SBU">
<!ENTITY shadow-version "4.6">
<!ENTITY shadow-size "1,639 KB">
<!ENTITY shadow-version "4.7">
<!ENTITY shadow-size "1,587 KB">
<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
<!ENTITY shadow-md5 "b491fecbf1232632c32ff8f1437fd60e">
<!ENTITY shadow-md5 "f7ce18c8dfd05f1a009266cb604d58b7">
<!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/">
<!ENTITY shadow-ch6-du "46 MB">
<!ENTITY shadow-ch6-sbu "0.2 SBU">
@ -703,23 +703,23 @@
<!ENTITY udev-lfs-md5 "d92afb0c6e8e616792068ee4737b0d24">
<!ENTITY udev-lfs-home " ">
<!ENTITY util-linux-minor "2.33">
<!ENTITY util-linux-version "2.33.2"> <!-- 2.33.x -->
<!ENTITY util-linux-size "4,597 KB">
<!ENTITY util-linux-minor "2.34">
<!ENTITY util-linux-version "2.34"> <!-- 2.33.x -->
<!ENTITY util-linux-size "4,859 KB">
<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
<!ENTITY util-linux-md5 "91653b90fcbe9c161153e39b8cc69fb5">
<!ENTITY util-linux-md5 "a78cbeaed9c39094b96a48ba8f891d50">
<!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
<!ENTITY util-linux-ch5-du "147 MB">
<!ENTITY util-linux-ch5-sbu "1 SBU">
<!ENTITY util-linux-ch6-du "214 MB">
<!ENTITY util-linux-ch6-sbu "1.5 SBU">
<!ENTITY vim-version "8.1">
<!ENTITY vim-version "8.1.1535">
<!ENTITY vim-majmin "81">
<!ENTITY vim-docdir "vim/vim81">
<!ENTITY vim-size "10,995 KB">
<!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
<!ENTITY vim-md5 "1739a1df312305155285f0cfa6118294">
<!ENTITY vim-size "14,028 KB">
<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
<!ENTITY vim-md5 "95935d54145e03a1c5a499bb3712817d">
<!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-ch6-du "169 MB">
<!ENTITY vim-ch6-sbu "1.3 SBU">