From 3b60741f5a8fe76b0d42f254fa6423247bd0d88b Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Sun, 28 Apr 2013 22:25:00 +0000 Subject: [PATCH] Further syncs with trunk to minimise differences to this branch git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10257 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 35 ++ chapter01/changelog.xml | 816 +------------------------------ chapter01/whatsnew.xml | 14 +- chapter02/creatingfilesystem.xml | 2 +- chapter02/creatingpartition.xml | 4 +- chapter04/abouttestsuites.xml | 2 +- chapter05/tcl.xml | 5 + chapter06/gcc.xml | 3 +- chapter06/glibc.xml | 2 +- chapter06/gmp.xml | 12 +- chapter06/kbd.xml | 8 +- chapter06/kmod.xml | 2 +- chapter08/fstab.xml | 4 +- general.ent | 2 +- packages.ent | 20 +- prologue/standards.xml | 2 +- prologue/why.xml | 9 - 17 files changed, 70 insertions(+), 872 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index b11a7e019..d0988c02c 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1656,6 +1656,41 @@ + + Popt + + + &dependencies; + + + Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make + + + + + &testsuites; + + + Diffutils and Sed + + + + + &before; + + + Pkg-config + + + + + &external; + + + None + + + Procps-ng diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c39e80511..ede4988d8 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -333,821 +333,7 @@ 2013-03-01 - [bdubbs] - Upgrade to Linux-3.8.1. Fixes - #3295. - - - - - - 2013-02-27 - - - [bdubbs] - Fix a potential test error in procps-ng. - Thanks to Pierre Labastie for the patch. Fixes - #3293. - - - - - - 2013-02-26 - - - [bdubbs] - Upgrade to File-5.13. Fixes - #3292. - - - - - - 2013-02-26 - - - [ken] - Remove the obsolete resizecons program from kbd, again. - - - - - - 2013-02-24 - - - [matthew] - Upgrade to IPRoute2-3.8.0. Fixes - #3291. - - - [matthew] - Upgrade to Linux-3.8. Fixes - #3290. - - - - - - 2013-02-19 - - - [bdubbs] - Update file name for adjusting CD-ROM - rules mode in section 7.5.1. - - - - - - 2013-02-18 - - - [bdubbs] - Upgrade to Coreutils-8.21. Fixes - #3286. - - - [bdubbs] - Upgrade to Texinfo-5.0. Fixes - #3284. - - - [bdubbs] - Upgrade to Linux-3.7.9. Fixes - #3281. - - - - - - 2013-02-15 - - - Move newly added components into place. - - - Removed Sysklogd-1.5. Journald will be used for logging. - - - Re-add Sysvinit package. Few programs are needed from the - package. - - - - - - 2013-02-13 - - - [matthew] - Added full build of Systemd including its remaining - dependencies (attr, dbus, gperf, intltool and libcap2). - - - - - - 2013-02-11 - - - [krejzi] - Added a patch to Glibc that removes - references to /var/db and replaces it with FHS-compliant - location. - - - [krejzi] - Added instructions to install nscd configuration - file and runtime directory. - - - - - - 2013-02-10 - - - [krejzi] - Modified Util-Linux instructions to - install mesg and sulogin utilities that were part of - Sysvinit. - - - - - - 2013-02-06 - - - [matthew] - Remove Sysvinit package; Systemd will be used to - boot the OS now. - - - [matthew] - Remove Sysvinit bootscripts and custom Udev rules, - to aid with Systemd integration. - - - - - - 2013-01-30 - - - [bdubbs] - Change ncurses instructions to create - and install .pc files. - - - - - - 2013-01-29 - - - [matthew] - Upgrade to Man-Pages-3.46. Fixes - #3278. - - - [matthew] - Upgrade to Linux-3.7.5. Fixes - #3277. - - - - - - 2013-01-27 - - - [bdubbs] - Update to pkg-config-0.28. Fixes - #3276 - - - - - - - 2013-01-25 - - - [bdubbs] - Revise procps-ng install instructions - to place files in the proper locations. - - - - - - 2013-01-24 - - - [bdubbs] - Remove bashisms from init-functions - file in the boot scripts. - - - - - - 2013-01-24 - - - [bdubbs] - Upgrade to e2fsprogs-1.42.7. Fixes - #3274. - - - - - - 2013-01-22 - - - [bdubbs] - Upgrade to Linux-3.7.4. Fixes - #3273. - - - - - - 2013-01-21 - - - [bdubbs] - Upgrade to Procps-ng-3.3.6. Fixes - #3095. - - - - - - 2013-01-20 - - - [matthew] - Upgrade to Linux-3.7.3. Fixes - #3272. - - - - - - 2013-01-11 - - - [bdubbs] - Revised explanation for /etc/modprobe.conf. - Fixes #3270. - - - [bdubbs] - Update udev-lfs init-net-rules.sh - script for "en*" devices introduced in systemd-197. - - - - - - - 2013-01-09 - - - [bdubbs] - Reformat 'Rebooting the System' - recommendations. - - - [bdubbs] - Update udev-lfs scripts. Update to - systemd-197. - - - - - - 2013-01-02 - - - [matthew] - Upgrade to Bash-4.2.42. Fixes - #3268. - - - [matthew] - Upgrade to Groff-1.22.1. Fixes - #3266. - - - [matthew] - Upgrade to Automake-1.13.1. Fixes - #3265. - - - [matthew] - Upgrade to Coreutils-8.20. Fixes - #3215. - - - - - - 2012-12-31 - - - [bdubbs] - Add patch to fix binutils test suite. - All binutils tests now pass, so remove the "-k" flag - from test invocation. - Thanks to Pierre Labastie for the patch. - - - - - - 2012-12-30 - - - [matthew] - Upgrade to Kbd-1.15.5. Fixes - #3239. - - - [matthew] - All E2fsprogs tests pass now, so remove the - "-k" flag from its invocation. - - - - - - 2012-12-28 - - - [bdubbs] - Put traceroute in /bin for consistency. - Fixes - #3264. - - - [bdubbs] - Fix the location for mounting /dev/shm - inside chroot. Fixes - #3258. - - - [matthew] - Move the build of Procps to before E2fsprogs as the - latter requires ps to be available during its - testsuite run. - - - [matthew] - Upgrade to Gettext-0.18.2. Fixes - #3263. - - - [matthew] - Upgrade to Gawk-4.0.2. Fixes - #3262. - - - [matthew] - Upgrade to Glibc-2.17. Fixes - #3261. - - - [matthew] - Upgrade to Sed-4.2.2. Fixes - #3260. - - - [matthew] - Upgrade to GMP-5.1.0. Fixes - #3259. - - - [matthew] - Upgrade to Tcl-8.6.0. Fixes - #3257. - - - [matthew] - Upgrade to Man-Pages-3.45. Fixes - #3256. - - - - - - 2012-12-18 - - - [bdubbs] - Upgrade to Automake-1.12.6. Fixes - #3253. - - - [bdubbs] - Upgrade to Linux-3.7.1. Fixes - #3254. - - - - - - 2012-12-16 - - - [matthew] - Upgrade to Util-Linux-2.22.2. Fixes - #3250. - - - [matthew] - Remove a few entries from the acronym list as they - are no longer referenced in the book. Fixes - #3249. Thanks to Chris - Staub for the patch. - - - [matthew] - Upgrade to Bison-2.7. Fixes - #3247. - - - - - - 2012-12-12 - - - [matthew] - Upgrade to IPRoute2-3.7.0. Fixes - #3246. - - - [matthew] - Update Check's list of installed - programs. Fixes - #3245. Thanks - to Chris Staub for the patch. - - - [matthew] - All of Flex's tests pass, so remove the - "-k" option to its testsuite invocation. Fixes - #3244. - - - [matthew] - Upgrade to E2fsprogs-1.42.6. Fixes - #3243. - - - [matthew] - Remove redundant --enable-addons parameter to - Glibc's configure script. Fixes - #3241. - - - [matthew] - Update IRC server information. Fixes - #3240. Thanks - to Chris Staub for the patch. - - - [matthew] - Upgrade to Kmod-12. Fixes - #3238. - - - [matthew] - Upgrade to Linux-3.7. Fixes - #3237. - - - - - - 2012-12-03 - - - [bdubbs] - Fix build issues in makefile for - systemd-196/udev-lfs-196. - - - - - - 2012-11-28 - - - [bdubbs] - Update makefile and instructions for - systemd-196/udev-lfs-196. - - - - - - 2012-11-27 - - - [matthew] - Upgrade to Linux-3.6.8. Fixes - #3234. - - - - - - 2012-11-26 - - - [bdubbs] - Re-emphasize host system requirements in - Chapter 5 General Compilation Instructions. - - - - - - 2012-11-22 - - - [bdubbs] - Upgrade to systemd-196/udev-lfs-196. Fixes - #3233. - - - - - - 2012-11-18 - - - [matthew] - Upgrade to Linux-3.6.7. Fixes - #3232. - - - [matthew] - Upgrade to Automake-1.12.5. Fixes - #3231. - - - - - - 2012-11-14 - - - [matthew] - Upgrade to Tzdata-2012j. Fixes - #3227. - - - [matthew] - Upgrade to Binutils-2.23.1. Fixes - #3226. - - - - - - 2012-11-13 - - - [matthew] - Upgrade to Tcl-8.5.13. Fixes - #3224. - - - [matthew] - Upgrade to Kmod-11. Fixes - #3223. - - - [matthew] - Upgrade to Man-Pages-3.44. Fixes - #3222. - - - [matthew] - Upgrade to Bison-2.6.5. Fixes - #3221. - - - [matthew] - Upgrade to Tzdata-2012i. Fixes - #3220. - - - [matthew] - Upgrade to Linux-3.6.6. Fixes - #3219. - - - - - - 2012-11-03 - - - [matthew] - Upgrade to Perl-5.16.2. Fixes - #3218. - - - [matthew] - Upgrade to Bash-4.2.39. Fixes - #3217. - - - - - - 2012-11-02 - - - [matthew] - Change Freshmeat.net references to Freecode. Thanks - to Chris Staub for the report and patch. Fixes - #3216. - - - [matthew] - Upgrade to Check-0.9.9. Fixes - #3214. - - - [matthew] - Upgrade to Bison-2.6.4. Fixes - #3212. - - - [matthew] - Upgrade to Linux-3.6.5. Fixes - #3211. - - - [matthew] - Upgrade to Tzdata-2012h. Fixes - #3209. - - - [matthew] - Upgrade to Man-Pages-3.43. Fixes - #3208. - - - [matthew] - Clean up a couple of instructions for Flex, made - possible by the upgrade to Flex-2.5.37. Fixes - 3206 and - 3210. - - - - - - 2012-11-01 - - - [bdubbs] - Upgrade to systemd/lfs-udev-195. Fixes - #3197. - - - - - - 2012-10-15 - - - [bdubbs] - Add notes to the gcc and binutils - sections in Chapter 6 about "link time optimization" - and the extra files built by gcc. Fixes - #3200. - - - [bdubbs] - Upgrade to tzdata-2012f. Fixes - #3205. - - - [bdubbs] - Update installed program description - for several packages. Thanks to Chris Staub for the patch. - Fixes #3203. - - - - - - 2012-10-14 - - - [bdubbs] - Remove utmpdump from sysvinit - because it is now installed by util-linux. Thanks to - Chris Staub for the patch. Fixes - #3202. - - - [bdubbs] - Change procps to not install the - kill program that is now installed by util-linux. Fixes - #3201. - - - [bdubbs] - Update to util-linux-2.22.1. Fixes - #3199. - - - [bdubbs] - Update to linux-3.6.2. Fixes - #3198. - - - [bdubbs] - Add boot/shutdown script customization - instructions. - - - - - - 2012-10-02 - - - [matthew] - Upgrade to IPRoute2-3.6.0. Fixes - #3196. - - - [matthew] - Upgrade to Linux-3.6. Fixes - #3195. - - - [matthew] - Upgrade to Psmisc-22.20. Fixes - #3194. - - - [matthew] - Upgrade to Patch-2.7.1. Fixes - #3193. - - - [matthew] - Add a patch to allow Kmod's testsuite to pass on 32-bit - systems. Fixes #3191. - - - [matthew] - Upgrade to GCC-4.7.2. Fixes - #3190. - - - [matthew] - Use latest upstream fixes patch for Make, which - enables WebKitGtk to build with parallel builds. Fixes - #3188. - - - [matthew] - Upgrade to Man-DB-2.6.3. Fixes - #3187. - - - [matthew] - Upgrade to Libpipeline-1.2.2. Fixes - #3186. - - - [matthew] - Upgrade to Automake-1.12.4. Fixes - #3185. - - - [matthew] - Fix Flex instructions; the directory creation for - its documentation is performed by the Makefile since r9999. - - - - - - 2012-09-27 - - - [bdubbs] - Update to systemd/udev-lfs-193. Fixes - #3192. - - - - - - 2012-09-27 - - - [bdubbs] - Update to systemd/udev-lfs-192. Fixes - #3189. - - - - - - 2012-09-16 - - - [matthew] - Upgrade to Patch-2.7. Fixes - #3182. - - - [matthew] - Upgrade to MPC-1.0.1. Fixes - #3181. - - - [matthew] - Upgrade to Kmod-10. Fixes - #3180. - - - [matthew] - Fix link to Linux User's Guide. Fixes - #3179. - - - [matthew] - Upgrade to Less-451. Fixes - #3178. - - - [matthew] - Upgrade to Bash-4.2.37. Fixes - #3177. - - - [matthew] - Upgrade to Pkg-Config-0.27.1. Fixes - #3174. - - - [matthew] - Upgrade to Linux-3.5.4. Fixes - #3173. - - - - - - 2012-09-05 - - - [bdubbs] - Add udevadm trigger --action=change line - to udev script to support initramfs better. - - - - - - 2012-09-04 - - - [bdubbs] - Update grub packages and naming - conventions example. - - - [bdubbs] - Update to util-linux-2.22. Fixes - #3145. - - - - - - 2012-09-02 - - - [bdubbs] - Add a patch to Chapter 6 glibc to fix - the test-installation.pl script instead of just preventing - it from running. Fixes - #3175. - - - [bdubbs] - Update to systemd-189. Fixes - #3167. - - - - - - 2012-09-01 - - - [bdubbs] - LFS-7.2 released. + [bdubbs] - LFS-7.3 released. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 18f83cfcb..6a42ea8ef 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -224,6 +224,7 @@ Added: + Attr-&attr-version; @@ -233,10 +234,6 @@ &bash-fixes-patch; - - &coreutils-i18n-patch; - - D-Bus-&dbus-version; @@ -253,18 +250,10 @@ Intltool-&intltool-version; - - &kbd-backspace-patch; - - Libcap-&libcap-version; - - &make-fixes-patch; - - &perl-libc-patch; @@ -281,6 +270,7 @@ Removed: + bash-4.2-fixes-11.patch diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml index f7c05250f..cb49da0b4 100644 --- a/chapter02/creatingfilesystem.xml +++ b/chapter02/creatingfilesystem.xml @@ -28,7 +28,7 @@ mke2fs -jv /dev/<xxx> Replace <xxx> with the name of the LFS - partition (hda5 in our previous + partition (sda5 in our previous example). diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml index d9e58f184..86f9e2b98 100644 --- a/chapter02/creatingpartition.xml +++ b/chapter02/creatingpartition.xml @@ -51,7 +51,7 @@ Start a disk partitioning program such as cfdisk or fdisk with a command line option naming the hard disk on which the new partition will be created—for example - /dev/hda for the primary Integrated + /dev/sda for the primary Integrated Drive Electronics (IDE) disk. Create a Linux native partition and a swap partition, if needed. Please refer to cfdisk(8) or fdisk(8) if @@ -67,7 +67,7 @@ first time LFS users. Remember the designation of the new partition (e.g., hda5). This book will refer to this as + class="devicefile">sda5). This book will refer to this as the LFS partition. Also remember the designation of the swap partition. These names will be needed later for the /etc/fstab file. diff --git a/chapter04/abouttestsuites.xml b/chapter04/abouttestsuites.xml index 848ea59e8..b3c1146e1 100644 --- a/chapter04/abouttestsuites.xml +++ b/chapter04/abouttestsuites.xml @@ -42,7 +42,7 @@ most likely cause is that the host system does not have the devpts file system set up correctly. This issue is discussed in greater detail at - . + . Sometimes package test suites will fail, but for reasons which the developers are aware of and have deemed non-critical. Consult the logs located diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml index 9a264ad68..4fcc10b61 100644 --- a/chapter05/tcl.xml +++ b/chapter05/tcl.xml @@ -48,6 +48,11 @@ run in this chapter (they are not mandatory), these packages are required to run the test suites in . + First increase the amount of space needed by some regular expressions + in regression tests. + +sed -i s/500/5000/ generic/regc_nfa.c + Prepare Tcl for compilation: cd unix diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 1f844f1a0..641a95152 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -56,7 +56,8 @@ esac sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - Also fix an error in one of the check Makefiles: + Also fix an error in one of the check Makefiles and disable one test in + the g++ libmudflap test suite: sed -i -e /autogen/d -e /check.sh/d fixincludes/Makefile.in diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index c07167443..c68501b99 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -83,7 +83,7 @@ cd ../glibc-build --prefix=/usr \ --disable-profile \ --enable-kernel=2.6.25 \ - --libexecdir=/usr/lib/glibc + --libexecdir=/usr/lib The meaning of the new configure options: diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml index d2ee64c0c..2bdb71fa1 100644 --- a/chapter06/gmp.xml +++ b/chapter06/gmp.xml @@ -104,7 +104,7 @@ cp -v doc/{isa_abi_headache,configuration} doc/*.html \ Installed directory - libgmp.{a,so}, libgmpxx.{a,so}, and libmp.{a,so} + libgmp.{a,so} and libgmpxx.{a,so} /usr/share/doc/gmp-&gmp-version; @@ -134,16 +134,6 @@ cp -v doc/{isa_abi_headache,configuration} doc/*.html \ - - libmp - - Contains the Berkeley MP math functions. - - libmp - - - - diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index 380e771e7..fb7adc552 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -60,7 +60,7 @@ manpage. sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure -sed -i 's/resizecons.8 //' man/man8/Makefile.in && +sed -i 's/resizecons.8 //' man/man8/Makefile.in Prepare Kbd for compilation: @@ -134,7 +134,7 @@ cp -R -v doc/* /usr/share/doc/kbd-&kbd-version; chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo, kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to - psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons, + psfxtable), psfstriptable (link to psfxtable), psfxtable, setfont, setkeycodes, setleds, setmetamode, showconsolefont, showkey, unicode_start, and unicode_stop /usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps, @@ -309,7 +309,7 @@ cp -R -v doc/* /usr/share/doc/kbd-&kbd-version; - + setfont diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index 34fe61089..ab08834f3 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -45,8 +45,8 @@ ./configure --prefix=/usr \ --bindir=/bin \ - --sysconfdir=/etc \ --with-rootlibdir=/lib \ + --sysconfdir=/etc \ --disable-manpages \ --with-xz \ --with-zlib diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml index 80afb4878..26b40296b 100644 --- a/chapter08/fstab.xml +++ b/chapter08/fstab.xml @@ -34,8 +34,8 @@ EOF Replace <xxx>, <yyy>, and <fff> with the values appropriate for the system, for example, hda2, hda5, and sda2, sda5, and ext3. For details on the six fields in this file, see man 5 fstab. diff --git a/general.ent b/general.ent index 2500a2da4..43811291d 100644 --- a/general.ent +++ b/general.ent @@ -1,7 +1,7 @@ - + diff --git a/packages.ent b/packages.ent index 76b8b1ae0..1c4333189 100644 --- a/packages.ent +++ b/packages.ent @@ -469,8 +469,8 @@ - - + + @@ -522,14 +522,6 @@ - - - - - - - - @@ -567,6 +559,14 @@ + + + + + + + + diff --git a/prologue/standards.xml b/prologue/standards.xml index afdbee962..287e7bdc2 100644 --- a/prologue/standards.xml +++ b/prologue/standards.xml @@ -27,7 +27,7 @@ - Linux + Linux Standard Base (LSB) Specifications The LSB has five separate standards: Core, C++, Desktop, diff --git a/prologue/why.xml b/prologue/why.xml index 02aaad93f..f88588b2e 100644 --- a/prologue/why.xml +++ b/prologue/why.xml @@ -386,16 +386,7 @@ by the diff program. It is needed by the build procedure for several LFS packages. - Perl