diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index f95317273..f127be40e 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -52,10 +52,7 @@ cd build Prepare E2fsprogs for compilation: -LIBS=-L/tools/lib \ -CFLAGS=-I/tools/include \ -PKG_CONFIG_PATH=/tools/lib/pkgconfig \ -../configure --prefix=/usr \ +../configure --prefix=/usr \ --bindir=/bin \ --with-root-prefix="" \ --enable-elf-shlibs \ @@ -66,7 +63,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \ The meaning of the environment variable and configure options: - + --with-root-prefix="" and --bindir=/bin diff --git a/chapter06/readline.xml b/chapter06/readline.xml index da1eb34a7..93abec7ea 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -79,9 +79,10 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install make SHLIB_LIBS="-L/tools/lib -lncurses" install Now move the dynamic libraries to a more appropriate location - and fix up some symbolic links: + and fix up some permissions and symbolic links: 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 diff --git a/lfs-latest.php b/lfs-latest.php index a3200f79e..78244fc51 100644 --- a/lfs-latest.php +++ b/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" ) diff --git a/packages.ent b/packages.ent index fc19679dd..dd68e76dd 100644 --- a/packages.ent +++ b/packages.ent @@ -416,12 +416,12 @@ - + - + - +