浏览代码

Initial commit for LFS-7.0-rc1

git-svn-id: http://svn.linuxfromscratch.org/LFS/tags/7.0-rc1@9590 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs 14 年之前
父节点
当前提交
f891b39f67

+ 69 - 69
bootscripts/lfs/init.d/cleanfs

@@ -30,87 +30,87 @@
 
 
 # Function to create files/directory on boot.
 # Function to create files/directory on boot.
 create_files() {
 create_files() {
-	# Read in the configuration file.
-	exec 9>&0 < /etc/sysconfig/createfiles
-		while read name type perm usr grp dtype maj min junk
-		do
-			# Ignore comments and blank lines.
-       			case "${name}" in
-				""|\#*) continue ;;
-			esac
+   # Read in the configuration file.
+   exec 9>&0 < /etc/sysconfig/createfiles
+      while read name type perm usr grp dtype maj min junk
+      do
+         # Ignore comments and blank lines.
+               case "${name}" in
+            ""|\#*) continue ;;
+         esac
 
 
-			# Ignore existing files.
-			if [ ! -e "${name}" ]; then
-				# Create stuff based on its type.
-				case "${type}" in
-					dir)
-						mkdir "${name}"
-						;;
-					file)
-						:> "${name}"
-						;;
-					dev)
-						case "${dtype}" in
-							char)
-								mknod "${name}" c ${maj} ${min}
-								;;
-							block)
-								mknod "${name}" b ${maj} ${min}
-								;;
-							pipe)
-								mknod "${name}" p
-								;;
-							*) 
-								boot_mesg -n "\nUnknown device type: ${dtype}" ${WARNING}
-								boot_mesg "" ${NORMAL}
-								;;
-						esac
-						;;
-					*)
-						boot_mesg -n "\nUnknown type: ${type}" ${WARNING}
-						boot_mesg "" ${NORMAL}
-						continue
-						;;
-				esac
+         # Ignore existing files.
+         if [ ! -e "${name}" ]; then
+            # Create stuff based on its type.
+            case "${type}" in
+               dir)
+                  mkdir "${name}"
+                  ;;
+               file)
+                  :> "${name}"
+                  ;;
+               dev)
+                  case "${dtype}" in
+                     char)
+                        mknod "${name}" c ${maj} ${min}
+                        ;;
+                     block)
+                        mknod "${name}" b ${maj} ${min}
+                        ;;
+                     pipe)
+                        mknod "${name}" p
+                        ;;
+                     *) 
+                        boot_mesg -n "\nUnknown device type: ${dtype}" ${WARNING}
+                        boot_mesg "" ${NORMAL}
+                        ;;
+                  esac
+                  ;;
+               *)
+                  boot_mesg -n "\nUnknown type: ${type}" ${WARNING}
+                  boot_mesg "" ${NORMAL}
+                  continue
+                  ;;
+            esac
 
 
-				# Set up the permissions, too.
-				chown ${usr}:${grp} "${name}"
-				chmod ${perm} "${name}"
-			fi
-		done
-	exec 0>&9 9>&-
+            # Set up the permissions, too.
+            chown ${usr}:${grp} "${name}"
+            chmod ${perm} "${name}"
+         fi
+      done
+   exec 0>&9 9>&-
 }
 }
 
 
 case "${1}" in
 case "${1}" in
-	start)
-		boot_mesg -n "Cleaning file systems:" ${INFO}
+   start)
+      boot_mesg -n "Cleaning file systems:" ${INFO}
 
 
       if [ "${SKIPTMPCLEAN}" = "" ]; then
       if [ "${SKIPTMPCLEAN}" = "" ]; then
-		   boot_mesg -n " /tmp" ${NORMAL}
-		   cd /tmp &&
-		   find . -xdev -mindepth 1 ! -name lost+found -delete || failed=1
+         boot_mesg -n " /tmp" ${NORMAL}
+         cd /tmp &&
+         find . -xdev -mindepth 1 ! -name lost+found -delete || failed=1
       fi
       fi
 
 
-		> /var/run/utmp
+      > /var/run/utmp
 
 
-		if grep -q '^utmp:' /etc/group ; then
-			chmod 664 /var/run/utmp
-			chgrp utmp /var/run/utmp
-		fi
+      if grep -q '^utmp:' /etc/group ; then
+         chmod 664 /var/run/utmp
+         chgrp utmp /var/run/utmp
+      fi
 
 
-		(exit ${failed})
-		evaluate_retval
+      (exit ${failed})
+      evaluate_retval
 
 
-		if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
-			boot_mesg "Creating files and directories..."
-			create_files
-			evaluate_retval
-		fi
-		;;
-	*)
-		echo "Usage: ${0} {start}"
-		exit 1
-		;;
+      if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
+         boot_mesg "Creating files and directories..."
+         create_files
+         evaluate_retval
+      fi
+      ;;
+   *)
+      echo "Usage: ${0} {start}"
+      exit 1
+      ;;
 esac
 esac
 
 
 # End cleanfs
 # End cleanfs

+ 1 - 1
bootscripts/lfs/init.d/mountfs

@@ -57,7 +57,7 @@ case "${1}" in
 
 
    stop)
    stop)
       boot_mesg "Unmounting all other currently mounted file systems..."
       boot_mesg "Unmounting all other currently mounted file systems..."
-      umount -a -d -r >/dev/null
+      umount -a -d -r -t notmpfs >/dev/null
       evaluate_retval
       evaluate_retval
       ;;
       ;;
 
 

+ 14 - 14
bootscripts/lfs/sysconfig/createfiles

@@ -8,21 +8,21 @@
 # Version     : 00.00
 # Version     : 00.00
 #
 #
 # Notes       : The syntax of this file is as follows:
 # Notes       : The syntax of this file is as follows:
-# 		if type is equal to "file" or "dir"
-#  		<filename> <type> <permissions> <user> <group>
-# 		if type is equal to "dev"
-#  		<filename> <type> <permissions> <user> <group> <devtype> <major> <minor>
+#     if type is equal to "file" or "dir"
+#        <filename> <type> <permissions> <user> <group>
+#     if type is equal to "dev"
+#        <filename> <type> <permissions> <user> <group> <devtype> <major> <minor>
 #
 #
-# 		<filename> is the name of the file which is to be created
-# 		<type> is either file, dir, or dev.
-#   			file creates a new file
-#   			dir creates a new directory
-#   			dev creates a new device
-# 		<devtype> is either block, char or pipe
-#   			block creates a block device
-#   			char creates a character deivce
-#   			pipe creates a pipe, this will ignore the <major> and <minor> fields
-# 		<major> and <minor> are the major and minor numbers used for the device.
+#     <filename> is the name of the file which is to be created
+#     <type> is either file, dir, or dev.
+#           file creates a new file
+#           dir creates a new directory
+#           dev creates a new device
+#     <devtype> is either block, char or pipe
+#           block creates a block device
+#           char creates a character deivce
+#           pipe creates a pipe, this will ignore the <major> and <minor> fields
+#     <major> and <minor> are the major and minor numbers used for the device.
 ########################################################################
 ########################################################################
 
 
 # End /etc/sysconfig/createfiles
 # End /etc/sysconfig/createfiles

+ 23 - 0
chapter01/changelog.xml

@@ -36,6 +36,29 @@
     </listitem>
     </listitem>
 
 
 -->
 -->
+    <listitem>
+      <para>2011-08-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.21.1a. Fixes 
+          <ulink url="&lfs-ticket-root;2917">#2917</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.0.4. Fixes 
+          <ulink url="&lfs-ticket-root;2914">#2914</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.20. Fixes 
+          <ulink url="&lfs-ticket-root;2915">#2915</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix shutdown problem in bootscripts.  
+          Replace tab characters with spaces.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2011-08-14</para>
       <para>2011-08-14</para>
       <itemizedlist>
       <itemizedlist>

+ 2 - 2
chapter01/whatsnew.xml

@@ -205,9 +205,9 @@
     <!--<listitem>
     <!--<listitem>
       <para>&udev-config;</para>
       <para>&udev-config;</para>
     </listitem>-->
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux &util-linux-version;</para>
       <para>Util-Linux &util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
     <!--<listitem>
       <para>Vim &vim-version;</para>
       <para>Vim &vim-version;</para>
     </listitem>-->
     </listitem>-->

+ 1 - 1
chapter08/grub.xml

@@ -131,7 +131,7 @@ insmod ext2
 set root=(hd0,2)
 set root=(hd0,2)
 
 
 menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
 menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
-        linux   /boot/vmlinux-&linux-version;-lfs-&version; root=/dev/sda2 ro
+        linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
 }</literal>
 }</literal>
 EOF</userinput></screen>
 EOF</userinput></screen>
 
 

+ 2 - 2
chapter08/kernel.xml

@@ -118,11 +118,11 @@
 
 
     <para>The path to the kernel image may vary depending on the platform being
     <para>The path to the kernel image may vary depending on the platform being
     used. The filename below can be changed to suit your taste, but the stem of
     used. The filename below can be changed to suit your taste, but the stem of
-    the filename should be <emphasis>vmlinux</emphasis> to be compatible with
+    the filename should be <emphasis>vmlinuz</emphasis> to be compatible with
     the automatic setup of the boot process described in the next section.  The
     the automatic setup of the boot process described in the next section.  The
     following command assumes an x86 architecture:</para>
     following command assumes an x86 architecture:</para>
 
 
-<screen><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinux-&linux-version;-lfs-&version;</userinput></screen>
+<screen><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
 
 
     <para><filename>System.map</filename> is a symbol file for the kernel.
     <para><filename>System.map</filename> is a symbol file for the kernel.
     It maps the function entry points of every function in the kernel API,
     It maps the function entry points of every function in the kernel API,

+ 3 - 3
general.ent

@@ -1,8 +1,8 @@
-<!ENTITY version "SVN-20110814">
-<!ENTITY releasedate "Aug 14, 2011">
+<!ENTITY version "7.0-rc1">
+<!ENTITY releasedate "Aug 31, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY milestone "7.0">
-<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
+<!ENTITY generic-version "7.0-rc1"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
 <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">

+ 15 - 15
packages.ent

@@ -34,10 +34,10 @@
 <!ENTITY bash-ch6-du "35 MB">
 <!ENTITY bash-ch6-du "35 MB">
 <!ENTITY bash-ch6-sbu "1.4 SBU">
 <!ENTITY bash-ch6-sbu "1.4 SBU">
 
 
-<!ENTITY binutils-version "2.21.1">
-<!ENTITY binutils-size "18,488 KB">
+<!ENTITY binutils-version "2.21.1a">
+<!ENTITY binutils-size "18,553 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "a22801a9cad45c85e9ff6afc10537d72">
+<!ENTITY binutils-md5 "bde820eac53fa3a8d8696667418557ad">
 <!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
 <!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
 <!ENTITY binutils-ch5p1-du "350 MB">
 <!ENTITY binutils-ch5p1-du "350 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
@@ -297,7 +297,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
 
-<!ENTITY lfs-bootscripts-version "20110803">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20110830">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!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-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -323,19 +323,19 @@
 
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "0">
 <!ENTITY linux-minor-version "0">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "4">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "74,955 KB">
+<!ENTITY linux-size "74,961 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.bz2">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "aed949984b878b7fb77ffe9cbee8ce0c">
+<!ENTITY linux-md5 "dff86c657cabe813bda84c72bfb93ae8">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "540 - 800 MB">
 <!ENTITY linux-ch8-du "540 - 800 MB">
 <!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">
 <!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">
 
 
-<!ENTITY linux-headers-ch5-du "510 MB">
+<!ENTITY linux-headers-ch5-du "511 MB">
 <!ENTITY linux-headers-ch5-sbu "0.1 SBU">
 <!ENTITY linux-headers-ch5-sbu "0.1 SBU">
-<!ENTITY linux-headers-ch6-du "514 MB">
+<!ENTITY linux-headers-ch6-du "515 MB">
 <!ENTITY linux-headers-ch6-sbu "0.1 SBU">
 <!ENTITY linux-headers-ch6-sbu "0.1 SBU">
 
 
 <!ENTITY m4-version "1.4.16">
 <!ENTITY m4-version "1.4.16">
@@ -557,15 +557,15 @@
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
 <!ENTITY udev-config-home " ">
 <!ENTITY udev-config-home " ">
 
 
-<!ENTITY util-linux-version "2.19.1">
-<!ENTITY util-linux-size "4,294 KB">
-<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.19/util-linux-&util-linux-version;.tar.bz2">
-<!ENTITY util-linux-md5 "3eab06f05163dfa65479c44e5231932c">
+<!ENTITY util-linux-version "2.20">
+<!ENTITY util-linux-size "4,507 KB">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.20/util-linux-&util-linux-version;.tar.bz2">
+<!ENTITY util-linux-md5 "4dcacdbdafa116635e52b977d9d0e879">
 <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
 <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
 <!--<!ENTITY util-linux-ch5-du "19 MB">-->
 <!--<!ENTITY util-linux-ch5-du "19 MB">-->
 <!--<!ENTITY util-linux-ch5-sbu "0.1 SBU">-->
 <!--<!ENTITY util-linux-ch5-sbu "0.1 SBU">-->
-<!ENTITY util-linux-ch6-du "50 MB">
-<!ENTITY util-linux-ch6-sbu "0.6 SBU">
+<!ENTITY util-linux-ch6-du "69 MB">
+<!ENTITY util-linux-ch6-sbu "0.7 SBU">
 
 
 <!ENTITY vim-version "7.3">
 <!ENTITY vim-version "7.3">
 <!ENTITY vim-docdir "vim/vim73">
 <!ENTITY vim-docdir "vim/vim73">