gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 19:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix currency for attr and acl

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11429 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2018-07-04 20:07:40 +00:00
parent f6528ac86d
commit adcd988063
4 changed files with 9 additions and 11 deletions

9
chapter06/e2fsprogs.xml
View File

@ -52,10 +52,7 @@ cd build</userinput></screen>
<para>Prepare E2fsprogs for compilation:</para> <para>Prepare E2fsprogs for compilation:</para>
<screen><userinput remap="configure">LIBS=-L/tools/lib \ <screen><userinput remap="configure">../configure --prefix=/usr \
CFLAGS=-I/tools/include \
PKG_CONFIG_PATH=/tools/lib/pkgconfig \
../configure --prefix=/usr \
--bindir=/bin \ --bindir=/bin \
--with-root-prefix="" \ --with-root-prefix="" \
--enable-elf-shlibs \ --enable-elf-shlibs \
@ -66,7 +63,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
<variablelist> <variablelist>
<title>The meaning of the environment variable and configure options:</title> <title>The meaning of the environment variable and configure options:</title>
<!--
<varlistentry> <varlistentry>
<term><parameter>PKG_CONFIG_PATH, LIBS, CFLAGS</parameter></term> <term><parameter>PKG_CONFIG_PATH, LIBS, CFLAGS</parameter></term>
<listitem> <listitem>
@ -74,7 +71,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
<xref linkend="ch-tools-util-linux"/> package built earlier.</para> <xref linkend="ch-tools-util-linux"/> package built earlier.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
-->
<varlistentry> <varlistentry>
<term><parameter>--with-root-prefix=""</parameter> and <term><parameter>--with-root-prefix=""</parameter> and
<parameter>--bindir=/bin</parameter></term> <parameter>--bindir=/bin</parameter></term>

3
chapter06/readline.xml
View File

@ -79,9 +79,10 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
<screen><userinput remap="install">make SHLIB_LIBS="-L/tools/lib -lncurses" install</userinput></screen> <screen><userinput remap="install">make SHLIB_LIBS="-L/tools/lib -lncurses" install</userinput></screen>
<para>Now move the dynamic libraries to a more appropriate location <para>Now move the dynamic libraries to a more appropriate location
and fix up some symbolic links:</para> and fix up some permissions and symbolic links:</para>
<screen><userinput remap="install">mv -v /usr/lib/lib{readline,history}.so.* /lib <screen><userinput remap="install">mv -v /usr/lib/lib{readline,history}.so.* /lib
chmod -v u+w /lib/lib{readline,history}.so.*
ln -sfv ../../lib/$(readlink /usr/lib/libreadline.so) /usr/lib/libreadline.so ln -sfv ../../lib/$(readlink /usr/lib/libreadline.so) /usr/lib/libreadline.so
ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</userinput></screen> ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</userinput></screen>

2
lfs-latest.php
View File

@ -234,7 +234,7 @@ if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
if ( $package == "attr" || if ( $package == "attr" ||
$package == "acl" ) $package == "acl" )
{ {
return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d)\.*$/" ); return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d).tar.*$/" );
} }
if ( $package == "e2fsprogs" ) if ( $package == "e2fsprogs" )

6
packages.ent
View File

@ -416,12 +416,12 @@
<!ENTITY linux-major-version "4"> <!ENTITY linux-major-version "4">
<!ENTITY linux-minor-version "17"> <!ENTITY linux-minor-version "17">
<!ENTITY linux-patch-version "2"> <!ENTITY linux-patch-version "3">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> --> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "99,773 KB"> <!ENTITY linux-size "99,783 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "dfe836c521c754a3f54f5f535f2ea588"> <!ENTITY linux-md5 "a5899b46a3d146c65bc2ba724db2f4ca">
<!ENTITY linux-home "https://www.kernel.org/"> <!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine, allnoconfig extended for a hopefully-bootable build on desktop machine,