Browse Source

Translate r11429

Fix currency for attr and acl
Clean instruction of e2fsprogs
Fix permittion of readline libraries
Bruce Dubbs 7 years ago
parent
commit
d0530bf36e
4 changed files with 10 additions and 12 deletions
  1. 3 6
      chapter06/e2fsprogs.xml
  2. 3 2
      chapter06/readline.xml
  3. 1 1
      lfs-latest.php
  4. 3 3
      packages.ent

+ 3 - 6
chapter06/e2fsprogs.xml

@@ -50,10 +50,7 @@ cd build</userinput></screen>
 
     <para>准备安装 E2fsprogs:</para>
 
-<screen><userinput remap="configure">LIBS=-L/tools/lib                    \
-CFLAGS=-I/tools/include              \
-PKG_CONFIG_PATH=/tools/lib/pkgconfig \
-../configure --prefix=/usr           \
+<screen><userinput remap="configure">../configure --prefix=/usr           \
              --bindir=/bin           \
              --with-root-prefix=""   \
              --enable-elf-shlibs     \
@@ -64,7 +61,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
 
     <variablelist>
       <title>环境变量和配置选项的含义:</title>
-
+<!--
       <varlistentry>
         <term><parameter>PKG_CONFIG_PATH, LIBS, CFLAGS</parameter></term>
         <listitem>
@@ -72,7 +69,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
           <xref linkend="ch-tools-util-linux"/> 软件包。</para>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry>
         <term><parameter>--with-root-prefix=""</parameter> 和
               <parameter>--bindir=/bin</parameter></term>

+ 3 - 2
chapter06/readline.xml

@@ -82,10 +82,11 @@ sed -i '/{OLDSUFF}/c:' support/shlib-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
-    and fix up some symbolic links:</para-->
-	<para>下面将动态库移动到更合适的位置,并修复一些符号链接:</para>
+    and fix up some permissions and symbolic links:</para-->
+	<para>下面将动态库移动到更合适的位置,并修正访问权限和符号链接:</para>
 
 <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/libhistory.so ) /usr/lib/libhistory.so</userinput></screen>
 

+ 1 - 1
lfs-latest.php

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

+ 3 - 3
packages.ent

@@ -416,12 +416,12 @@
 
 <!ENTITY linux-major-version "4">
 <!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;.&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-md5 "dfe836c521c754a3f54f5f535f2ea588">
+<!ENTITY linux-md5 "a5899b46a3d146c65bc2ba724db2f4ca">
 <!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,