Author: bdubbs Date: 2012-04-11 11:00:59 -0600 (Wed, 11 Apr 2012) New Revision: 9809
Modified: branches/jh/bootscripts/ChangeLog branches/jh/bootscripts/Makefile branches/jh/bootscripts/lfs/init.d/checkfs branches/jh/bootscripts/lfs/init.d/mountfs branches/jh/bootscripts/lfs/init.d/udev branches/jh/bootscripts/lfs/lib/services/init-functions branches/jh/bootscripts/lfs/lib/services/ipv4-static branches/jh/bootscripts/lfs/sbin/ifdown branches/jh/bootscripts/lfs/sbin/ifup branches/jh/bootscripts/lfs/sbin/ifup.8 branches/jh/chapter01/changelog.xml branches/jh/chapter01/whatsnew.xml branches/jh/chapter03/patches.xml branches/jh/chapter05/binutils-pass1.xml branches/jh/chapter05/binutils-pass2.xml branches/jh/chapter05/gcc-pass2.xml branches/jh/chapter05/glibc.xml branches/jh/chapter06/automake.xml branches/jh/chapter06/binutils.xml branches/jh/chapter06/coreutils.xml branches/jh/chapter06/createfiles.xml branches/jh/chapter06/gcc.xml branches/jh/chapter06/glibc.xml branches/jh/chapter06/iproute2.xml branches/jh/chapter07/network.xml branches/jh/general.ent branches/jh/packages.ent branches/jh/patches.ent branches/jh/prologue/hostreqs.xml Log: Merge HEAD into jh branch Modified: branches/jh/bootscripts/ChangeLog =================================================================== --- branches/jh/bootscripts/ChangeLog 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/ChangeLog 2012-04-11 17:00:59 UTC (rev 9809) @@ -1,3 +1,16 @@ +2012-04-09 Bruce Dubbs <[email protected]> + + * General update of network scripts ifup/ifdown and services + ** Add if_true utility function to init_functions + ** Change variable INTERFACES to COMPONENT_INTERFACES for bridge interface + ** ifdown now only uses the first SERVICE + ** Updated ifup.8 to reflect current usage + ** ifup + *** Move interface up logic to after service scripts. Eliminates the + need for the LINK_CHECK variable. + *** Sets the GATEWAY if the variable is set + *** Add MTU logic to ifup + 2012-01-22 Matt Burgess <[email protected]> * lfs/init.d/udev: Change udevd path following upstream changes to its Modified: branches/jh/bootscripts/Makefile =================================================================== --- branches/jh/bootscripts/Makefile 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/Makefile 2012-04-11 17:00:59 UTC (rev 9809) @@ -90,8 +90,8 @@ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc0.d/K80network ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc0.d/K90sysklogd ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals + ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc0.d/S65swap ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rc0.d/S70mountfs - ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc0.d/S80swap ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rc0.d/S90localnet ln -sf ../init.d/halt ${EXTDIR}/rc.d/rc0.d/S99halt @@ -119,8 +119,8 @@ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc6.d/K80network ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc6.d/K90sysklogd ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals + ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc6.d/S65swap ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rc6.d/S70mountfs - ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc6.d/S80swap ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rc6.d/S90localnet ln -sf ../init.d/reboot ${EXTDIR}/rc.d/rc6.d/S99reboot Modified: branches/jh/bootscripts/lfs/init.d/checkfs =================================================================== --- branches/jh/bootscripts/lfs/init.d/checkfs 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/lfs/init.d/checkfs 2012-04-11 17:00:59 UTC (rev 9809) @@ -42,13 +42,6 @@ case "${1}" in start) - - # If any LVM based partitions are on the system, ensure they - # are activated so they can be checked/used. - if [ -x /sbin/vgchange ]; then - /sbin/vgchange -a y >/dev/null - fi - if [ -f /fastboot ]; then msg="/fastboot found, will omit " msg="${msg} file system checks as requested.\n" Modified: branches/jh/bootscripts/lfs/init.d/mountfs =================================================================== --- branches/jh/bootscripts/lfs/init.d/mountfs 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/lfs/init.d/mountfs 2012-04-11 17:00:59 UTC (rev 9809) @@ -62,11 +62,11 @@ stop) # Don't unmount tmpfs like /run log_info_msg "Unmounting all other currently mounted file systems..." - umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs >/dev/null + umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs,noproc >/dev/null evaluate_retval # Make all LVM volume groups unavailable, if appropriate - if [ -x /sbin/vgchange ]; then /sbin/vgchange -an; fi + if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi ;; *) Modified: branches/jh/bootscripts/lfs/init.d/udev =================================================================== --- branches/jh/bootscripts/lfs/init.d/udev 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/lfs/init.d/udev 2012-04-11 17:00:59 UTC (rev 9809) @@ -58,6 +58,11 @@ # Now wait for udevd to process the uevents we triggered /sbin/udevadm settle + + # If any LVM based partitions are on the system, ensure they + # are activated so they can be used. + if [ -x /sbin/vgchange ]; then /sbin/vgchange -a y >/dev/null; fi + log_success_msg2 ;; Modified: branches/jh/bootscripts/lfs/lib/services/init-functions =================================================================== --- branches/jh/bootscripts/lfs/lib/services/init-functions 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/lfs/lib/services/init-functions 2012-04-11 17:00:59 UTC (rev 9809) @@ -778,4 +778,16 @@ return 0 } +################################################################################ +# is_true() # +# # +# Purpose: Utility to test if a variable is true | yes | 1 # +# # +################################################################################ +is_true() +{ + [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ] || [ "$1" = "y" ] || + [ "$1" = "t" ] +} + # End /lib/lsb/init-functions Modified: branches/jh/bootscripts/lfs/lib/services/ipv4-static =================================================================== --- branches/jh/bootscripts/lfs/lib/services/ipv4-static 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/lfs/lib/services/ipv4-static 2012-04-11 17:00:59 UTC (rev 9809) @@ -42,7 +42,7 @@ case "${2}" in up) - if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP})" == "" ]; then + if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP}/)" == "" ]; then # Cosmetic output not needed for multiple services if ! $(echo ${SERVICE} | grep -q " "); then @@ -52,24 +52,13 @@ log_info_msg "Adding IPv4 address ${IP} to the ${1} interface..." ip addr add ${args} dev ${1} evaluate_retval - - if [ -n "${GATEWAY}" ]; then - if ip route | grep -q default; then - log_warning_msg "\nGateway already setup; skipping." - else - log_info_msg "Setting up default gateway..." - ip route add default via ${GATEWAY} dev ${1} - evaluate_retval - fi - fi else - msg="Cannot add IPv4 address ${IP} to ${1}. Already present." - log_warning_msg "$msg" + log_warning_msg "Cannot add IPv4 address ${IP} to ${1}. Already present." fi ;; down) - if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP})" != "" ]; then + if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP}/)" != "" ]; then log_info_msg "Removing IPv4 address ${IP} from the ${1} interface..." ip addr del ${args} dev ${1} evaluate_retval Modified: branches/jh/bootscripts/lfs/sbin/ifdown =================================================================== --- branches/jh/bootscripts/lfs/sbin/ifdown 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/lfs/sbin/ifdown 2012-04-11 17:00:59 UTC (rev 9809) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ######################################################################## # Begin /sbin/ifdown # @@ -67,33 +67,29 @@ exit 1 fi -# Reverse the order -SERVICES= -for S in ${SERVICE}; do SERVICES="${SERVICES} ${S}"; done +# We only need to first service to bring down the interface +S=`echo ${SERVICE} | cut -f1 -d" "` -# This will run the service scripts if ip link show ${IFACE} > /dev/null 2>&1; then - for S in ${SERVICES}; do - - if [ -n "${S}" -a -x "/lib/services/${S}" ]; then - IFCONFIG=${file} /lib/services/${S} ${IFACE} down - else - MSG="Unable to process ${file}. Either " - MSG="${MSG}the SERVICE variable was not set " - MSG="${MSG}or the specified service cannot be executed." - log_failure_msg "$MSG" - exit 1 - fi - done + if [ -n "${S}" -a -x "/lib/services/${S}" ]; then + IFCONFIG=${file} /lib/services/${S} ${IFACE} down + else + MSG="Unable to process ${file}. Either " + MSG="${MSG}the SERVICE variable was not set " + MSG="${MSG}or the specified service cannot be executed." + log_failure_msg "$MSG" + exit 1 + fi else log_warning_msg "Interface ${1} doesn't exist." fi +# Leave the interface up if there are additional interfaces in the device link_status=`ip link show ${IFACE} 2>/dev/null` if [ -n "${link_status}" ]; then if [ "$(echo "${link_status}" | grep UP)" != "" ]; then - if [ "$(ip addr show ${IFACE} | grep 'inet ')" != "" ]; then + if [ "$(ip addr show ${IFACE} | grep 'inet ')" == "" ]; then log_info_msg "Bringing down the ${IFACE} interface..." ip link set ${IFACE} down evaluate_retval Modified: branches/jh/bootscripts/lfs/sbin/ifup =================================================================== --- branches/jh/bootscripts/lfs/sbin/ifup 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/lfs/sbin/ifup 2012-04-11 17:00:59 UTC (rev 9809) @@ -8,7 +8,7 @@ # Kevin P. Fleming - [email protected] # Update : Bruce Dubbs - [email protected] # -# Version : LFS 7.0 +# Version : LFS 7.2 # # Notes : The IFCONFIG variable is passed to the SERVICE script # in the /lib/services directory, to indicate what file the @@ -16,8 +16,25 @@ # ######################################################################## -RELEASE="7.0" +up() +{ + if ip link show $1 > /dev/null 2>&1; then + link_status=`ip link show $1` + if [ -n "${link_status}" ]; then + if ! echo "${link_status}" | grep -q UP; then + ip link set $1 up + fi + fi + + else + log_failure_msg "\nInterface ${IFACE} doesn't exist." + exit 1 + fi +} + +RELEASE="7.2" + USAGE="Usage: $0 [ -hV ] [--help] [--version] interface" VERSTR="LFS ifup, version ${RELEASE}" @@ -78,7 +95,7 @@ for S in ${SERVICE}; do if [ ! -x "/lib/services/${S}" ]; then - MSG="\n Unable to process ${file}. Either " + MSG="\nUnable to process ${file}. Either " MSG="${MSG}the SERVICE '${S} was not present " MSG="${MSG}or cannot be executed." log_failure_msg "$MSG" @@ -86,38 +103,34 @@ fi done -if [ -z "${CHECK_LINK}" -o \ - "${CHECK_LINK}" = "y" -o \ - "${CHECK_LINK}" = "yes" -o \ - "${CHECK_LINK}" = "1" ]; then +# Create/configure the interface +for S in ${SERVICE}; do + IFCONFIG=${file} /lib/services/${S} ${IFACE} up +done - # Bring up the interface - if ip link show ${IFACE} > /dev/null 2>&1; then - link_status=`ip link show ${IFACE}` +# Bring up the interface and any components +for I in $IFACE $INTERFACE_COMPONENTS; do up $I; done - if [ -n "${link_status}" ]; then - if ! echo "${link_status}" | grep -q UP; then - ip link set ${IFACE} up - fi - fi - - else - log_failure_msg2 "Interface ${IFACE} doesn't exist." - exit 1 - fi -fi - # Set MTU if requested. Check if MTU has a "good" value. if test -n "${MTU}"; then if [[ ${MTU} =~ ^[0-9]+$ ]] && [[ $MTU -ge 68 ]] ; then - ip link set dev ${IFACE} mtu $MTU + for I in $IFACE $INTERFACE_COMPONENTS; do + ip link set dev $I mtu $MTU; + done else log_info_msg2 "Invalid MTU $MTU" fi fi -for S in ${SERVICE}; do - IFCONFIG=${file} /lib/services/${S} ${IFACE} up -done +# Set the route default gateway if requested +if [ -n "${GATEWAY}" ]; then + if ip route | grep -q default; then + log_warning_msg "\nGateway already setup; skipping." + else + log_info_msg "Setting up default gateway..." + ip route add default via ${GATEWAY} dev ${IFACE} + evaluate_retval + fi +fi # End /sbin/ifup Modified: branches/jh/bootscripts/lfs/sbin/ifup.8 =================================================================== --- branches/jh/bootscripts/lfs/sbin/ifup.8 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/bootscripts/lfs/sbin/ifup.8 2012-04-11 17:00:59 UTC (rev 9809) @@ -28,15 +28,52 @@ -V, --version Show version information. -EXAMPLE +EXAMPLES ifup eth0 Bring up the interface defined in the file /etc/sysconfig/ifconfig.eth0 + ONBOOT=no + IFACE=eth0 + SERVICE=ipv4-static + IP=192.168.1.22 + GATEWAY=192.168.1.1 + PREFIX=24 + BROADCAST=192.168.1.255 + ifdown eth0:2 Bring down the interface defined in the file /etc/sysconfig/ifconfig.eth0:2 + ONBOOT=no + IFACE=eth0:2 + SERVICE=dhcpcd + + DHCP_START="--waitip" + DHCP_STOP="-k" + + # Set PRINTIP="yes" to have the script print the DHCP IP address + PRINTIP="yes" + + # Set PRINTALL="yes" to print the DHCP assigned values for + # IP, SM, DG, and 1st NS. + PRINTALL="no" + + ifup br0 + Bring up the interface defined in the file + /etc/sysconfig/ifconfig.br0 + + ONBOOT=yes + IFACE=br0 + SERVICE="bridge ipv4-static" + IP=192.168.1.22 + GATEWAY=192.168.1.1 + PREFIX=24 + BROADCAST=192.168.1.255 + STP=no # Spanning tree protocol, default no + INTERFACE_COMPONENTS=eth0 # Add to IFACE + IP_FORWARD=true + NOTES The program does not configure network interfaces direct- ly. It runs scripts defined by the SERVICE variable in @@ -51,11 +88,24 @@ SERVICE - The service script to run to bring up the inter- face. Standard services are ipv4-static and ipv4-static-route. Other services such as dhcp - may be installed. + or bridge may be installed. This value may + be a list of services when the interface is a + compound device such as a bridge. ONBOOT - If set to 'yes', the specified interface is configured by the netowrk boot script. + GATEWAY - The default IP address to use for routing if + the destination IP address is not in a static + route or on a local network, e.g., 192.168.1.1. + For secondary IP addresses on an interface, this + parameter should not be specified. + + INTERFACE_COMPONENTS - A list of component interfaces + only needed for a compound device such as a bridge. + This list is normally a single value, e.g. eth0, + for use with a virtual host such as kvm. + Other paramters that are service specific include: ipv4-static @@ -64,24 +114,20 @@ e.g. 192.168.1.2. PREFIX - The number of bits that specify the network - number of the interface, e.g., 24. + number of the interface. The default, if not + specified, is 24. - GATEWAY - The default IP address to use for routing - if the destination IP address is not in a - static route or on a local network, e.g., - 192.168.1.1. For secondary IP addresses on - an interface, this parameter should not be - specified. - BROADCAST - The brodcast address for this interface, - e.g 192.168.1.255. + e.g 192.168.1.255. If not specified, + the broadcast address will be calculated + from the IP and PREFIX. ipv4-static-route TYPE - The type of route, typically 'default', 'network', 'or host'. - IP - The IP address for a network or host, if thei + IP - The IP address for a network or host, if the TYPE is not 'default'. PREFIX - The prefix for the associated IP address. @@ -92,12 +138,32 @@ to the destinations covered by the specified route. (optional) + dhcp/dhclient + + DHCP_START - Optional parameters to pass to the dhcp client + at startup. + + DHCP_STOP - Optional paremeters to pass to the dhcp client + at shutdown. + + PRINTIP - Flag to print the dhcp address to stdout + + PRINTALL - Flag to print all obtained dhcp data to stdout + + bridge + + IP_FORWARD - An optional flag to enable the system to forward + inbound IP packets received by one interface to + another outbound interface. + + STP - Set bridge spanning tree protocol. Default is no. + FILES /etc/sysconfig/ifconfig.* definitions of network interfaces AUTHORS - The ifup/ifdown suite was written by Nathan Coulson + The ifup/ifdown suite was written by Nathan Coulson <[email protected]> and Kevin P. Fleming <[email protected]> and updated by Bruce Dubbs <bdubbs@linuxfromscratch>. @@ -105,4 +171,4 @@ SEE ALSO ip(8). -IFUP/IFDOWN 18 Sep 2011 ifup(8) +IFUP/IFDOWN 8 April 2012 ifup(8) Modified: branches/jh/chapter01/changelog.xml =================================================================== --- branches/jh/chapter01/changelog.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter01/changelog.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -36,8 +36,160 @@ </listitem> --> + <listitem> + <para>2012-05-09</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update networking bootscripts. See + bootscripts change log for details. + Fixes + <ulink url="&lfs-ticket-root;3053">#3053</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> <listitem> + <para>2012-05-05</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Change the location for the python gdb module + generated by gcc to the correct location. Fixes (again) + <ulink url="&lfs-ticket-root;3048">#3048</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2012-04-03</para> + <itemizedlist> + <listitem> + <para>[matthew] - Upgrade to Linux-3.3.1. Fixes + <ulink url="&lfs-ticket-root;3059">#3059</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to Automake-1.11.4. Fixes + <ulink url="&lfs-ticket-root;3058">#3058</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to Gawk-4.0.1. Fixes + <ulink url="&lfs-ticket-root;3056">#3056</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to Util-Linux-2.21.1. Fixes + <ulink url="&lfs-ticket-root;3055">#3055</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to E2fsprogs-1.42.2. Fixes + <ulink url="&lfs-ticket-root;3051">#3051</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to Coreutils-8.16 and drop the uname patch. + Fixes <ulink url="&lfs-ticket-root;3048">#3048</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2012-03-28</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Move a python module for gdb generated by gcc + to a better location. Fixes + <ulink url="&lfs-ticket-root;3048">#3048</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Adjust minimum version of xz-utils in Host + Requirements.</para> + </listitem> + <listitem> + <para>[bdubbs] - Reword description of log files in section + Creating Essential Files.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2012-03-27</para> + <itemizedlist> + <listitem> + <para>[matthew] - Add a patch to fix building of Binutils with the + -O3 compiler flag. Thanks to Pierre Labastie for the report.</para> + </listitem> + <listitem> + <para>[matthew] - Add the GCC fix patch back to Glibc instructions + to fix a build issue on 32-bit hosts. Thanks to Pierre Labastie for + the report.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2012-03-26</para> + <itemizedlist> + <listitem> + <para>[matthew] - Upgrade to Man-Pages-3.38. Fixes + <ulink url="&lfs-ticket-root;3047">#3047</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to E2fsprogs-1.42.1. Fixes + <ulink url="&lfs-ticket-root;3046">#3046</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to Glibc-2.15. Fixes + <ulink url="&lfs-ticket-root;3045">#3045</ulink>. Thanks to Andy + Benton for the patch.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to GCC-4.7.0. Fixes + <ulink url="&lfs-ticket-root;3044">#3044</ulink>. Thanks to Andy + Benton for the patch.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to IPRoute2-3.3.0. Fixes + <ulink url="&lfs-ticket-root;3043">#3043</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2012-03-22</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Fix corner case in ipv4-static script. </para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2012-03-20</para> + <itemizedlist> + <listitem> + <para>[matthew] - Upgrade to Linux-3.3. Fixes + <ulink url="&lfs-ticket-root;3042">#3042</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to Kmod-7. Fixes + <ulink url="&lfs-ticket-root;3041">#3041</ulink>.</para> + </listitem> + <listitem> + <para>[matthew] - Upgrade to Udev-182. Fixes + <ulink url="&lfs-ticket-root;3040">#3040</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2012-03-19</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Move optional LVM initialization to the end + of the udev boot script so an LVM partition can be used for swap. + </para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2012-03-14</para> <itemizedlist> <listitem> Modified: branches/jh/chapter01/whatsnew.xml =================================================================== --- branches/jh/chapter01/whatsnew.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter01/whatsnew.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -28,9 +28,9 @@ <!--<listitem> <para>Autoconf &autoconf-version;</para> </listitem> --> - <!--<listitem> + <listitem> <para>Automake &automake-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Bash &bash-version;</para> </listitem>--> @@ -46,18 +46,18 @@ <!--<listitem> <para>Bzip2 &bzip2-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Coreutils &coreutils-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>DejaGNU &dejagnu-version;</para> </listitem>--> <!--<listitem> <para>Diffutils &diffutils-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>E2fsprogs &e2fsprogs-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Expect &expect-version;</para> </listitem>--> @@ -70,9 +70,9 @@ <!--<listitem> <para>Flex &flex-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Gawk &gawk-version;</para> - </listitem>--> + </listitem> <listitem> <para>GCC &gcc-version;</para> </listitem> @@ -82,9 +82,9 @@ <!--<listitem> <para>Gettext &gettext-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Glibc &glibc-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>GMP &gmp-version;</para> </listitem>--> @@ -106,9 +106,9 @@ <!--<listitem> <para>Inetutils &inetutils-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>IPRoute2 &iproute2-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Kbd &kbd-version;</para> </listitem>--> @@ -187,9 +187,9 @@ <!--<listitem> <para>Texinfo &texinfo-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Udev &udev-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>&udev-config;</para> </listitem>--> @@ -224,9 +224,21 @@ </listitem> <listitem> + <para>&binutils-build-patch;</para> + </listitem> + + <listitem> + <para>&coreutils-i18n-patch;</para> + </listitem> + + <listitem> <para>&gcc-startfiles-patch;</para> </listitem> + <listitem> + <para>&glibc-gcc_fix-patch;</para> + </listitem> + </itemizedlist> <itemizedlist> @@ -237,6 +249,14 @@ </listitem> <listitem> + <para>coreutils-8.15-i18n-1.patch</para> + </listitem> + + <listitem> + <para>coreutils-8.15-uname-1.patch</para> + </listitem> + + <listitem> <para>gcc-4.6.2-cross_compile-1.patch</para> </listitem> @@ -244,6 +264,22 @@ <para>gcc-4.6.2-startfiles_fix-1.patch</para> </listitem> + <listitem> + <para>glibc-2.14.1-fixes-1.patch</para> + </listitem> + + <listitem> + <para>glibc-2.14.1-gcc_fix-1.patch</para> + </listitem> + + <listitem> + <para>glibc-2.14.1-cpuid-1.patch</para> + </listitem> + + <listitem> + <para>glibc-2.14.1-sort-1.patch</para> + </listitem> + </itemizedlist> </sect1> Modified: branches/jh/chapter03/patches.xml =================================================================== --- branches/jh/chapter03/patches.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter03/patches.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -27,6 +27,14 @@ </varlistentry> <varlistentry> + <term>Binutils Build Fix Patch - <token>&binutils-build-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&binutils-build-patch;"/></para> + <para>MD5 sum: <literal>&binutils-build-patch-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para> @@ -43,14 +51,6 @@ </varlistentry> <varlistentry> - <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&coreutils-uname-patch;"/></para> - <para>MD5 sum: <literal>&coreutils-uname-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> <term>Flex GCC-4.4.x Patch - <token>&flex-gcc-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&flex-gcc-patch;"/></para> @@ -67,37 +67,13 @@ </varlistentry> <varlistentry> - <term>Glibc Bug Fixes Patch - <token>&glibc-fixes-patch-size;</token>:</term> + <term>Glibc GCC Fix Patch - <token>&glibc-gcc_fix-patch-size;</token>:</term> <listitem> - <para>Download: <ulink url="&patches-root;&glibc-fixes-patch;"/></para> - <para>MD5 sum: <literal>&glibc-fixes-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Glibc Bug Sort Relocatable Objects Patch - <token>&glibc-sort-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&glibc-sort-patch;"/></para> - <para>MD5 sum: <literal>&glibc-sort-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Glibc GCC Build Fix Patch - <token>&glibc-gcc_fix-patch-size;</token>:</term> - <listitem> <para>Download: <ulink url="&patches-root;&glibc-gcc_fix-patch;"/></para> <para>MD5 sum: <literal>&glibc-gcc_fix-patch-md5;</literal></para> </listitem> </varlistentry> - <varlistentry> - <term>Glibc GCC CPUID Patch - <token>&glibc-cpuid-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&glibc-cpuid-patch;"/></para> - <para>MD5 sum: <literal>&glibc-cpuid-patch-md5;</literal></para> - </listitem> - </varlistentry> - <!-- <varlistentry> <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term> Modified: branches/jh/chapter05/binutils-pass1.xml =================================================================== --- branches/jh/chapter05/binutils-pass1.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter05/binutils-pass1.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -52,6 +52,10 @@ linker and assembler to determine which of their own features to enable.</para> + <para>Apply a patch to prevent a build failure when using compiler optimizations:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen> + <para>The Binutils documentation recommends building Binutils outside of the source directory in a dedicated build directory:</para> Modified: branches/jh/chapter05/binutils-pass2.xml =================================================================== --- branches/jh/chapter05/binutils-pass2.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter05/binutils-pass2.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -43,6 +43,10 @@ <sect2 role="installation"> <title>Installation of Binutils</title> + <para>Apply a patch to prevent a build failure when using compiler optimizations:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen> + <para>Create a separate build directory again:</para> <screen><userinput remap="pre">mkdir -v ../binutils-build Modified: branches/jh/chapter05/gcc-pass2.xml =================================================================== --- branches/jh/chapter05/gcc-pass2.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter05/gcc-pass2.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -92,9 +92,9 @@ sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \ -e 's@/usr@/tools@g' $file.orig > $file echo ' -#undef STANDARD_INCLUDE_DIR -#define STANDARD_INCLUDE_DIR 0 -#define STANDARD_STARTFILE_PREFIX_1 "" +#undef STANDARD_STARTFILE_PREFIX_1 +#undef STANDARD_STARTFILE_PREFIX_2 +#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib" #define STANDARD_STARTFILE_PREFIX_2 ""' >> $file touch $file.orig done</userinput></screen> Modified: branches/jh/chapter05/glibc.xml =================================================================== --- branches/jh/chapter05/glibc.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter05/glibc.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -43,15 +43,18 @@ <sect2 role="installation"> <title>Installation of Glibc</title> - <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para> + <para>Address a header check that fails due to an incomplete build + environment at this point:</para> - <screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen> + <screen><userinput remap="pre">sed -i 's#$ac_includes_default#\n\n#' sysdeps/i386/configure</userinput></screen> - <para>Also address a header check that fails due to an incomplete build - environment at this point:</para> + <para>Fix a path that is hardcoded:</para> - <screen><userinput remap="pre">patch -Np1 -i ../&glibc-cpuid-patch;</userinput></screen> + <screen><userinput remap="pre">sed -i 's#/var/db#/tools/var/db#' Makeconfig</userinput></screen> + <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para> +<screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen> + <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> @@ -83,6 +86,7 @@ --enable-kernel=2.6.25 \ --with-headers=/tools/include \ libc_cv_forced_unwind=yes \ + libc_cv_ctors_header=yes \ libc_cv_c_cleanup=yes</userinput></screen> <variablelist> @@ -151,6 +155,14 @@ cleanup handling support is configured.</para> </listitem> </varlistentry> + <varlistentry> + <term><parameter>libc_cv_ctors_header=yes</parameter></term> + <listitem> + <para>Simlarly, we pass libc_cv_ctors_header=yes through to the + <command>configure</command> script so that the test is skipped and + gcc constructor support is configured.</para> + </listitem> + </varlistentry> </variablelist> Modified: branches/jh/chapter06/automake.xml =================================================================== --- branches/jh/chapter06/automake.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter06/automake.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -70,11 +70,11 @@ <segtitle>Installed directories</segtitle> <seglistitem> - <seg>acinstall, aclocal, aclocal-&automake-version;, automake, - automake-&automake-version;, compile, config.guess, config.sub, + <seg>acinstall, aclocal, aclocal-&am-minor-version;, automake, + automake-&am-minor-version;, compile, config.guess, config.sub, depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs, py-compile, symlink-tree, and ylwrap</seg> - <seg>/usr/share/aclocal-1.11, /usr/share/automake-1.11, + <seg>/usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;, /usr/share/doc/automake-&automake-version;</seg> </seglistitem> </segmentedlist> @@ -106,11 +106,11 @@ </varlistentry> <varlistentry id="aclocalversion"> - <term><command>aclocal-&automake-version;</command></term> + <term><command>aclocal-&am-minor-version;</command></term> <listitem> <para>A hard link to <command>aclocal</command></para> <indexterm zone="ch-system-automake aclocalversion"> - <primary sortas="b-aclocal-&automake-version;">aclocal-&automake-version;</primary> + <primary sortas="b-aclocal-&am-minor-version;">aclocal-&am-minor-version;</primary> </indexterm> </listitem> </varlistentry> @@ -133,11 +133,11 @@ </varlistentry> <varlistentry id="automake-version"> - <term><command>automake-&automake-version;</command></term> + <term><command>automake-&am-minor-version;</command></term> <listitem> <para>A hard link to <command>automake</command></para> <indexterm zone="ch-system-automake automake-version"> - <primary sortas="b-automake-&automake-version;">automake-&automake-version;</primary> + <primary sortas="b-automake-&am-minor-version;">automake-&am-minor-version;</primary> </indexterm> </listitem> </varlistentry> Modified: branches/jh/chapter06/binutils.xml =================================================================== --- branches/jh/chapter06/binutils.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter06/binutils.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -69,6 +69,10 @@ <screen><userinput remap="pre">sed -i "/exception_defines.h/d" ld/testsuite/ld-elf/new.cc sed -i "s/-fvtable-gc //" ld/testsuite/ld-selective/selective.exp</userinput></screen> + <para>Apply a patch to prevent a build failure when using compiler optimizations:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen> + <para>The Binutils documentation recommends building Binutils outside of the source directory in a dedicated build directory:</para> Modified: branches/jh/chapter06/coreutils.xml =================================================================== --- branches/jh/chapter06/coreutils.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter06/coreutils.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -41,14 +41,10 @@ <sect2 role="installation"> <title>Installation of Coreutils</title> - <para>A known issue with the <command>uname</command> program from - this package is that the <parameter>-p</parameter> switch always - returns <computeroutput>unknown</computeroutput>. The following patch - fixes this behavior for Intel architectures:</para> + <para>Fix a bug in a test case:</para> -<screen><userinput remap="pre">case `uname -m` in - i?86 | x86_64) patch -Np1 -i ../&coreutils-uname-patch; ;; -esac</userinput></screen> +<screen><userinput remap="pre">sed -i -e 's/! isatty/isatty/' \ + -e '45i\ || errno == ENOENT' gnulib-tests/test-getlogin.c</userinput></screen> <para>POSIX requires that programs from Coreutils recognize character boundaries correctly even in multibyte locales. The following patch @@ -64,7 +60,8 @@ <para>Now prepare Coreutils for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ +<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure \ + --prefix=/usr \ --libexecdir=/usr/lib \ --enable-no-install-program=kill,uptime</userinput></screen> Modified: branches/jh/chapter06/createfiles.xml =================================================================== --- branches/jh/chapter06/createfiles.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter06/createfiles.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -129,16 +129,18 @@ do not already exist. Initialize the log files and give them proper permissions:</para> -<screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp} -chgrp -v utmp /var/run/utmp /var/log/lastlog -chmod -v 664 /var/run/utmp /var/log/lastlog -chmod -v 600 /var/log/btmp</userinput></screen> +<screen><userinput>touch /var/log/{btmp,lastlog,wtmp} +chgrp -v utmp /var/log/lastlog +chmod -v 664 /var/log/lastlog +chmod -v 600 /var/log/btmp</userinput></screen> - <para>The <filename>/var/run/utmp</filename> file records the users - that are currently logged in. The <filename>/var/log/wtmp</filename> - file records all logins and logouts. The - <filename>/var/log/lastlog</filename> file records when - each user last logged in. The <filename>/var/log/btmp</filename> file - records the bad login attempts.</para> + <para>The <filename>/var/log/wtmp</filename> file records all logins and + logouts. The <filename>/var/log/lastlog</filename> file records when each + user last logged in. The <filename>/var/log/btmp</filename> file records the + bad login attempts.</para> + <note><para>The <filename>/run/utmp</filename> file records the users that + are currently logged in. This file is created dynamically in the boot + scripts.</para></note> + </sect1> Modified: branches/jh/chapter06/gcc.xml =================================================================== --- branches/jh/chapter06/gcc.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter06/gcc.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -289,6 +289,11 @@ href="readjusting.xml" xpointer="xpointer(//*[@os='v'])"/> + <para>Finally, move a misplaced file:</para> + +<screen><userinput remap="install">mkdir -pv /usr/share/gdb/auto-load/usr/lib +mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen> + </sect2> <sect2 id="contents-gcc" role="content"> Modified: branches/jh/chapter06/glibc.xml =================================================================== --- branches/jh/chapter06/glibc.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter06/glibc.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -100,20 +100,9 @@ <screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen> - <para>Fix a couple of bugs in Glibc that can cause crashes and core dumps:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch; -patch -Np1 -i ../&glibc-sort-patch;</userinput></screen> - - <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para> - + <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para> <screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen> - <para>Fix a stack imbalance that occurs under some conditions:</para> - -<screen><userinput remap="pre">sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \ -nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timed{rd,wr}lock.S</userinput></screen> - <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> Modified: branches/jh/chapter06/iproute2.xml =================================================================== --- branches/jh/chapter06/iproute2.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter06/iproute2.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -53,11 +53,6 @@ sed -i /ARPD/d Makefile rm man/man8/arpd.8</userinput></screen> - <para>Remove references to some Libnl headers that are not required by - IPRoute2:</para> - -<screen><userinput remap="pre">sed -i -e '/netlink\//d' ip/ipl2tp.c</userinput></screen> - <para>Compile the package:</para> <screen><userinput remap="make">make DESTDIR=</userinput></screen> Modified: branches/jh/chapter07/network.xml =================================================================== --- branches/jh/chapter07/network.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/chapter07/network.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -165,15 +165,18 @@ gateway IP address, if one is present. If not, then comment out the variable entirely.</para> - <para>The <envar>PREFIX</envar> variable needs to contain the number of + <para>The <envar>PREFIX</envar> variable containis the number of bits used in the subnet. Each octet in an IP address is 8 bits. If the subnet's netmask is 255.255.255.0, then it is using the first three octets (24 bits) to specify the network number. If the netmask is 255.255.255.240, it would be using the first 28 bits. Prefixes longer than 24 bits are commonly used by DSL and cable-based Internet Service Providers (ISPs). In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the - <envar>PREFIX</envar> variable according to your specific subnet.</para> + <envar>PREFIX</envar> variable according to your specific subnet.i + If omitted, the PREFIX defaults to 24.</para> + <para>For more information see the <command>ifup</command> man page.</para> + </sect2> <sect2 id="resolv.conf"> Modified: branches/jh/general.ent =================================================================== --- branches/jh/general.ent 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/general.ent 2012-04-11 17:00:59 UTC (rev 9809) @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20120314"> -<!ENTITY releasedate "Mar 14, 2012"> +<!ENTITY version "SVN-20120409"> +<!ENTITY releasedate "Apr 09, 2012"> <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.2"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> Modified: branches/jh/packages.ent =================================================================== --- branches/jh/packages.ent 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/packages.ent 2012-04-11 17:00:59 UTC (rev 9809) @@ -16,10 +16,11 @@ <!ENTITY autoconf-ch6-du "12.4 MB"> <!ENTITY autoconf-ch6-sbu "4.8 SBU"> -<!ENTITY automake-version "1.11.3"> -<!ENTITY automake-size "1,051 KB"> +<!ENTITY automake-version "1.11.4"> +<!ENTITY am-minor-version "1.11"> +<!ENTITY automake-size "1,066 KB"> <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz"> -<!ENTITY automake-md5 "3d72b2076eb4397ad5e9a2aace6357fd"> +<!ENTITY automake-md5 "d1dd41acf56a30d8da7bf20c5ac223db"> <!ENTITY automake-home "&gnu-software;automake/"> <!ENTITY automake-ch6-du "28.8 MB"> <!ENTITY automake-ch6-sbu "18.3 SBU"> @@ -76,10 +77,10 @@ <!ENTITY check-ch5-du "4.8 MB"> <!ENTITY check-ch5-sbu "0.1 SBU"> -<!ENTITY coreutils-version "8.15"> -<!ENTITY coreutils-size "4,827 KB"> +<!ENTITY coreutils-version "8.16"> +<!ENTITY coreutils-size "4,925 KB"> <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz"> -<!ENTITY coreutils-md5 "094909fafa86110140b32e4948941545"> +<!ENTITY coreutils-md5 "89b06f91634208dceba7b36ad1f9e8b9"> <!ENTITY coreutils-home "&gnu-software;coreutils/"> <!ENTITY coreutils-ch5-du "88 MB"> <!ENTITY coreutils-ch5-sbu "0.7 SBU"> @@ -107,14 +108,11 @@ <!-- NOTE: When updating e2fsprogs, remember to check the list of acceptable features that can be shown by debugfs in chapter02/creatingfilesystem.xml --> -<!ENTITY e2fsprogs-version "1.42"> -<!ENTITY e2fsprogs-size "5,576 KB"> +<!ENTITY e2fsprogs-version "1.42.2"> +<!ENTITY e2fsprogs-size "5,618 KB"> <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz"> -<!ENTITY e2fsprogs-md5 "a3c4ffd7352310ab5e9412965d575610"> +<!ENTITY e2fsprogs-md5 "04f4561a54ad0419248316a00c016baa"> <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/";> -<!-- -<!ENTITY e2fsprogs-ch5-du "38 MB"> -<!ENTITY e2fsprogs-ch5-sbu "0.3 SBU"> --> <!ENTITY e2fsprogs-ch6-du "45 MB"> <!ENTITY e2fsprogs-ch6-sbu "0.5 SBU"> @@ -159,20 +157,20 @@ <!ENTITY flex-ch6-du "28 MB"> <!ENTITY flex-ch6-sbu "0.7 SBU"> -<!ENTITY gawk-version "4.0.0"> -<!ENTITY gawk-size "2,016 KB"> -<!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.bz2"> -<!ENTITY gawk-md5 "7cdc48e99b885a4bbe0e98dcf1706b22"> +<!ENTITY gawk-version "4.0.1"> +<!ENTITY gawk-size "1,575 KB"> +<!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz"> +<!ENTITY gawk-md5 "a601b032c39cd982f34272664f8afa49"> <!ENTITY gawk-home "&gnu-software;gawk/"> <!ENTITY gawk-ch5-du "28 MB"> <!ENTITY gawk-ch5-sbu "0.2 SBU"> <!ENTITY gawk-ch6-du "28 MB"> <!ENTITY gawk-ch6-sbu "0.2 SBU"> -<!ENTITY gcc-version "4.6.3"> -<!ENTITY gcc-size "70,312 KB"> +<!ENTITY gcc-version "4.7.0"> +<!ENTITY gcc-size "80,585 KB"> <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2"> -<!ENTITY gcc-md5 "773092fe5194353b02bb0110052a972e"> +<!ENTITY gcc-md5 "2a0f1d99fda235c29d40b561f81d9a77"> <!ENTITY gcc-home "http://gcc.gnu.org/";> <!ENTITY gcc-ch5p1-du "1.2 GB"> <!ENTITY gcc-ch5p1-sbu "5.0 SBU"> @@ -201,10 +199,10 @@ <!ENTITY gettext-ch6-du "125 MB"> <!ENTITY gettext-ch6-sbu "5.8 SBU"> -<!ENTITY glibc-version "2.14.1"> -<!ENTITY glibc-size "15,284 KB"> -<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2"> -<!ENTITY glibc-md5 "5869a2620c6917dd392289864c6ce595"> +<!ENTITY glibc-version "2.15"> +<!ENTITY glibc-size "10,039 KB"> +<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz"> +<!ENTITY glibc-md5 "4f9f3b0e780a8c7179a372d34e9452bc"> <!ENTITY glibc-home "&gnu-software;libc/"> <!ENTITY glibc-ch5-du "501 MB"> <!ENTITY glibc-ch5-sbu "5.5 SBU"> @@ -273,10 +271,10 @@ <!ENTITY inetutils-ch6-du "17 MB"> <!ENTITY inetutils-ch6-sbu "0.4 SBU"> -<!ENTITY iproute2-version "3.2.0"> -<!ENTITY iproute2-size "365 KB"> +<!ENTITY iproute2-version "3.3.0"> +<!ENTITY iproute2-size "369 KB"> <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz"> -<!ENTITY iproute2-md5 "6f814291cc3d7f4312cf8c2c052da5f1"> +<!ENTITY iproute2-md5 "39a7ff2c5149475c710365954e2ce49b"> <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/"> <!ENTITY iproute2-ch6-du "6.6 MB"> <!ENTITY iproute2-ch6-sbu "0.1 SBU"> @@ -289,10 +287,10 @@ <!ENTITY kbd-ch6-du "16.0 MB"> <!ENTITY kbd-ch6-sbu "less than 0.1 SBU"> -<!ENTITY kmod-version "6"> -<!ENTITY kmod-size "976 KB"> +<!ENTITY kmod-version "7"> +<!ENTITY kmod-size "959 KB"> <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz"> -<!ENTITY kmod-md5 "bad08102fad212cd34405136d9a7eb94"> +<!ENTITY kmod-md5 "7bd916ae1c8a38e7697fdd8118bc98eb"> <!ENTITY kmod-home " "> <!ENTITY kmod-ch6-du "16.0 MB"> <!ENTITY kmod-ch6-sbu "less than 0.1 SBU"> @@ -305,7 +303,7 @@ <!ENTITY less-ch6-du "3.5 MB"> <!ENTITY less-ch6-sbu "less than 0.1 SBU"> -<!ENTITY lfs-bootscripts-version "20120229"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20120409"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile --> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile --> @@ -330,13 +328,13 @@ <!ENTITY libtool-ch6-sbu "3.7 SBU"> <!ENTITY linux-major-version "3"> -<!ENTITY linux-minor-version "2"> -<!ENTITY linux-patch-version "11"> +<!ENTITY linux-minor-version "3"> +<!ENTITY linux-patch-version "1"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> -<!ENTITY linux-size "63,557 KB"> +<!ENTITY linux-size "64,308 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> -<!ENTITY linux-md5 "0e3d5a3dab51b3c36940461582bc06df"> +<!ENTITY linux-md5 "eb31735968d1ac9a431322089f7bc3a3"> <!ENTITY linux-home "http://www.kernel.org/";> <!ENTITY linux-ch8-du "540 - 800 MB"> <!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU"> @@ -374,10 +372,10 @@ <!ENTITY man-db-ch6-du "22 MB"> <!ENTITY man-db-ch6-sbu "0.4 SBU"> -<!ENTITY man-pages-version "3.37"> -<!ENTITY man-pages-size "1,038 KB"> +<!ENTITY man-pages-version "3.38"> +<!ENTITY man-pages-size "1,045 KB"> <!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz";> -<!ENTITY man-pages-md5 "6b25e0411e203aa28ae2cb25a692a224"> +<!ENTITY man-pages-md5 "cadfdc11d3860d813fb338c9c89a3c8a"> <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/";> <!ENTITY man-pages-ch6-du "21 MB"> <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU"> @@ -519,10 +517,10 @@ <!ENTITY texinfo-ch6-du "21 MB"> <!ENTITY texinfo-ch6-sbu "0.3 SBU"> -<!ENTITY udev-version "181"> -<!ENTITY udev-size "678 KB"> +<!ENTITY udev-version "182"> +<!ENTITY udev-size "673 KB"> <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.xz"> -<!ENTITY udev-md5 "0d7af750702620a871b9f9b98d8ad859"> +<!ENTITY udev-md5 "023877e6cc0d907994b8c648beab542b"> <!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev/udev.html"> <!ENTITY udev-ch6-du "9.3 MB"> <!ENTITY udev-ch6-sbu "0.2 SBU"> @@ -533,10 +531,10 @@ <!ENTITY udev-config-md5 "UDEV-MD5SUM"> <!-- Updated in Makefile --> <!ENTITY udev-config-home " "> -<!ENTITY util-linux-version "2.21"> -<!ENTITY util-linux-size "2,885 KB"> +<!ENTITY util-linux-version "2.21.1"> +<!ENTITY util-linux-size "2,905 KB"> <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.21/util-linux-&util-linux-version;.tar.xz"> -<!ENTITY util-linux-md5 "208aa058f4117759d2939d1be7d662fc"> +<!ENTITY util-linux-md5 "ad602dcd528f340b1329cfa6200d8f80"> <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/";> <!ENTITY util-linux-ch6-du "69 MB"> <!ENTITY util-linux-ch6-sbu "0.7 SBU"> Modified: branches/jh/patches.ent =================================================================== --- branches/jh/patches.ent 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/patches.ent 2012-04-11 17:00:59 UTC (rev 9809) @@ -7,20 +7,21 @@ <!ENTITY bash-fixes-patch-size "24 KB"> +<!ENTITY binutils-build-patch "binutils-&binutils-version;-build_fix-1.patch"> +<!ENTITY binutils-build-patch-md5 "ddc5a9a170ed6ba23b8eb7d808e609ee"> +<!ENTITY binutils-build-patch-size "1.4 KB"> + + <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch"> <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f"> <!ENTITY bzip2-docs-patch-size "1.6 KB"> <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch"> -<!ENTITY coreutils-i18n-patch-md5 "70953451fa1d0e950266b3d0477adb8d"> +<!ENTITY coreutils-i18n-patch-md5 "d48bbb0a7f9d8effd975aa9cef9436ce"> <!ENTITY coreutils-i18n-patch-size "123 KB"> -<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch"> -<!ENTITY coreutils-uname-patch-md5 "500481b75892e5c07e19e9953a690e54"> -<!ENTITY coreutils-uname-patch-size "1.6 KB"> - <!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch"> <!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7"> <!ENTITY diffutils-i18n-patch-size "18 KB"> @@ -36,23 +37,11 @@ <!ENTITY gcc-startfiles-patch-size "1.5 KB"> -<!ENTITY glibc-fixes-patch "glibc-&glibc-version;-fixes-1.patch"> -<!ENTITY glibc-fixes-patch-md5 "13bdfb7db1654d9c3d7934d24479a6c4"> -<!ENTITY glibc-fixes-patch-size "5.5 KB"> - <!ENTITY glibc-gcc_fix-patch "glibc-&glibc-version;-gcc_fix-1.patch"> <!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd"> <!ENTITY glibc-gcc_fix-patch-size "2.5 KB"> -<!ENTITY glibc-cpuid-patch "glibc-&glibc-version;-cpuid-1.patch"> -<!ENTITY glibc-cpuid-patch-md5 "4f110dc9c8d4754fbda841492ce796b4"> -<!ENTITY glibc-cpuid-patch-size "0.8 KB"> -<!ENTITY glibc-sort-patch "glibc-&glibc-version;-sort-1.patch"> -<!ENTITY glibc-sort-patch-md5 "740e71017059a4290761db0cc9dd63f3"> -<!ENTITY glibc-sort-patch-size "8.0 KB"> - - <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch"> <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673"> <!ENTITY grub-inode-patch-size "4.8 KB"> Modified: branches/jh/prologue/hostreqs.xml =================================================================== --- branches/jh/prologue/hostreqs.xml 2012-04-09 19:16:14 UTC (rev 9808) +++ branches/jh/prologue/hostreqs.xml 2012-04-11 17:00:59 UTC (rev 9809) @@ -131,7 +131,7 @@ </listitem> <listitem> - <para><emphasis role="strong">Xz-5.0.3</emphasis></para> + <para><emphasis role="strong">Xz-5.0.0</emphasis></para> </listitem> </itemizedlist> -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page
