diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a5d685489..c12136b99 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,18 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2018-07-03 + + + [bdubbs] - Make symbolic links in inital part of + Chapter 6 consistent for all versions of the book. Allows + removing environment variables no longer needed with e2fsprogs. + + + + + 2018-07-03 diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 5a44725db..cd90477df 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -39,15 +39,20 @@ will be replaced by real files throughout the course of this chapter after the software has been installed: + -ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin + +ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin ln -sv /tools/bin/{env,install,perl} /usr/bin ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib @@ -176,10 +181,11 @@ ln -sv bash /bin/sh --> - + + /usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*} - These links prevent systemd utilities from acquiring an + These links prevent utilities from acquiring an unnecessary reference to the /tools directory. diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index f95317273..7b6a07955 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -52,10 +52,12 @@ cd build Prepare E2fsprogs for compilation: -LIBS=-L/tools/lib \ + +../configure --prefix=/usr \ --bindir=/bin \ --with-root-prefix="" \ --enable-elf-shlibs \ @@ -66,7 +68,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/general.ent b/general.ent index cfbb40e8e..459df6cf8 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - +