r1931 - in profiles/LFS/trunk: chapter05 chapter06 chapter08 config scripts skeleton/etc

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Fri Jul 8 12:00:32 PDT 2005


Author: thomasp
Date: 2005-07-08 13:00:29 -0600 (Fri, 08 Jul 2005)
New Revision: 1931

Removed:
   profiles/LFS/trunk/chapter05/udev.xml
Modified:
   profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
   profiles/LFS/trunk/chapter06/zlib.xml
   profiles/LFS/trunk/chapter08/grub.xml
   profiles/LFS/trunk/config/package.ent
   profiles/LFS/trunk/scripts/wget.lfs.urls
   profiles/LFS/trunk/skeleton/etc/fstab
   profiles/LFS/trunk/skeleton/etc/inittab
   profiles/LFS/trunk/skeleton/etc/inputrc
Log:
merge r1930 to trunk profile

Modified: profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2005-07-08 19:00:29 UTC (rev 1931)
@@ -135,6 +135,7 @@
         <source>&vim-lang-package;</source>
         <source>&vim-security-patch;</source>
         <source>&zlib-package;</source>
+	<source>&zlib-security-fix-patch;</source>
         <destination>&LFS;&packages_dir;</destination>
       </copy>
     </stage>

Deleted: profiles/LFS/trunk/chapter05/udev.xml
===================================================================
--- profiles/LFS/trunk/chapter05/udev.xml	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/chapter05/udev.xml	2005-07-08 19:00:29 UTC (rev 1931)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
-[
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-<alfs>
-  <package name="udev" version="&udev-version;">
-    <stage name="Unpacking">
-      <unpack>
-        <digest>&udev-md5;</digest>
-        <archive>&packages_dir;/&udev-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <base>&build_dir;/&udev-directory;</base>
-      </stageinfo>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&udev-etcdir-patch;</param>
-      </patch>
-      <make>
-        <param>prefix=/tools</param>
-        <param>udevdir=/dev</param>
-      </make>
-      <make>
-        <param>prefix=/tools</param>
-        <param>install</param>
-      </make>
-      <copy base="&packages_dir;">
-        <option>force</option>
-        <source>&udev-permissions-file;</source>
-        <destination>/tools/etc/udev/permissions.d/00-lfs.permissions</destination>
-      </copy>
-      <copy base="&packages_dir;">
-        <option>force</option>
-        <source>&udev-rules-file;</source>
-        <destination>/tools/etc/udev/rules.d/00-lfs.rules</destination>
-      </copy>
-    </stage>
-    <stage name="Cleanup">
-      <remove>&build_dir;/&udev-directory;</remove>
-    </stage>
-  </package>
-</alfs>

Modified: profiles/LFS/trunk/chapter06/zlib.xml
===================================================================
--- profiles/LFS/trunk/chapter06/zlib.xml	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/chapter06/zlib.xml	2005-07-08 19:00:29 UTC (rev 1931)
@@ -16,6 +16,16 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&zlib-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&zlib-security-fix-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&zlib-directory;</base>

Modified: profiles/LFS/trunk/chapter08/grub.xml
===================================================================
--- profiles/LFS/trunk/chapter08/grub.xml	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/chapter08/grub.xml	2005-07-08 19:00:29 UTC (rev 1931)
@@ -9,15 +9,26 @@
 ]>
 <alfs>
   <stage name="Making the LFS System Bootable">
-    <execute command="grub --batch">
+    <!-- Uncomment the following if you wish to allow grub to install itself automatically.-->
+    <!-- If uncommenting remove the space between the two dashes (- -) in order for the
+     command to work properly -->
+    <!--<execute command="grub - -batch">
       <prefix>echo -e "root (&grub-root;)\nsetup (&grub-install-location;)\nquit" | </prefix>
       <param>1>/dev/null</param>
       <param>2>/dev/null</param>
-    </execute>
+    </execute>-->
     <copy>
       <source>&skeleton_dir;/boot/grub/menu.lst</source>
       <destination>/boot/grub</destination>
     </copy>
+    <mkdir>
+      <name>/etc/grub</name>
+    </mkdir>
+    <link>
+      <option>force</option>
+      <target>/boot/grub/menu.lst</target>
+      <name>/etc/grub</name>
+    </link>
     <search_replace>
       <file>/boot/grub/menu.lst</file>
       <find>[LFS-version]</find>

Modified: profiles/LFS/trunk/config/package.ent
===================================================================
--- profiles/LFS/trunk/config/package.ent	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/config/package.ent	2005-07-08 19:00:29 UTC (rev 1931)
@@ -340,3 +340,6 @@
 <!ENTITY zlib-version "1.2.2">
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
 <!ENTITY zlib-directory "zlib-&zlib-version;">
+
+<!ENTITY zlib-security-fix-patch "zlib-&zlib-version;-security_fix-1.patch">
+

Modified: profiles/LFS/trunk/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/trunk/scripts/wget.lfs.urls	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/scripts/wget.lfs.urls	2005-07-08 19:00:29 UTC (rev 1931)
@@ -81,6 +81,7 @@
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/tar-1.15.1-sparse_fix-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/util-linux-2.12q-cramfs-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/vim-6.3-security_fix-1.patch
+http://www.linuxfromscratch.org/patches/lfs/6.1-pre2/zlib-1.2.2-security_fix-1.patch
 
 ftp://ftp.gnome.org/pub/gnome/sources/libxml2/2.6/libxml2-2.6.17.tar.bz2
 http://lfs.securewebservices.co.uk/alfs/downloads/stable/nALFS-1.2.4.tar.bz2

Modified: profiles/LFS/trunk/skeleton/etc/fstab
===================================================================
--- profiles/LFS/trunk/skeleton/etc/fstab	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/skeleton/etc/fstab	2005-07-08 19:00:29 UTC (rev 1931)
@@ -1,9 +1,12 @@
 # Begin /etc/fstab
-# filesystem mount-point fs-type options dump fsck-order
-/dev/hda2 / ext3 defaults 1 1
-/dev/hda3 swap swap pri=1 0 0
-proc /proc proc defaults 0 0
-sysfs /sys sysfs defaults 0 0
-devpts /dev/pts devpts gid=4,mode=620 0 0
-shm /dev/shm tmpfs defaults 0 0
+# filesystem 	mount-point 	fs-type options 	dump fsck-order
+/dev/hda2 	/ 		ext3 	defaults 	1 1
+/dev/hda3 	swap 		swap 	pri=1 		0 0
+proc 		/proc 		proc 	defaults 	0 0
+sysfs 		/sys 		sysfs 	defaults 	0 0
+devpts 		/dev/pts 	devpts 	gid=4,mode=620 	0 0
+shm 		/dev/shm 	tmpfs 	defaults 	0 0
+
+#usbfs        	/proc/bus/usb 	usbfs   devgid=14,devmode=0660 0 0
+
 # End /etc/fstab

Modified: profiles/LFS/trunk/skeleton/etc/inittab
===================================================================
--- profiles/LFS/trunk/skeleton/etc/inittab	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/skeleton/etc/inittab	2005-07-08 19:00:29 UTC (rev 1931)
@@ -1,7 +1,7 @@
 # Begin /etc/inittab 
  
-id:3:initdefault: 
- 
+id:3:initdefault:
+
 si::sysinit:/etc/rc.d/init.d/rc sysinit 
  
 l0:0:wait:/etc/rc.d/init.d/rc 0 

Modified: profiles/LFS/trunk/skeleton/etc/inputrc
===================================================================
--- profiles/LFS/trunk/skeleton/etc/inputrc	2005-07-08 18:54:47 UTC (rev 1930)
+++ profiles/LFS/trunk/skeleton/etc/inputrc	2005-07-08 19:00:29 UTC (rev 1931)
@@ -1,42 +1,43 @@
-# Begin /etc/inputrc 
- 
-# Make sure we dont output everything on the 1 line 
-set horizontal-scroll-mode Off 
- 
-# Enable 8bit input 
-set meta-flag On 
-set input-meta On 
- 
-# Turns off 8th bit stripping 
-set convert-meta Off 
- 
-# Keep the 8th bit for display 
-set output-meta On 
- 
-# none, visible or audible 
-set bell-style none 
- 
-# All of the following map the escape sequence of the 
-# value contained inside the 1st argument to the 
-# readline specific functions 
- 
-"\eOd": backward-word 
-"\eOc": forward-word 
- 
-# for linux console 
-"\e[1~": beginning-of-line 
-"\e[4~": end-of-line 
-"\e[5~": beginning-of-history 
-"\e[6~": end-of-history 
-"\e[3~": delete-char 
-"\e[2~": quoted-insert 
- 
-# for xterm 
-"\eOH": beginning-of-line 
-"\eOF": end-of-line 
- 
-# for Konsole 
-"\e[H": beginning-of-line 
-"\e[F": end-of-line 
- 
+# Begin /etc/inputrc
+# Modified by Chris Lynn <roryo at roryo.dynup.net>
+
+# Allow the command prompt to wrap to the next line
+set horizontal-scroll-mode Off
+
+# Enable 8bit input
+set meta-flag On
+set input-meta On
+
+# Turns off 8th bit stripping
+set convert-meta Off
+
+# Keep the 8th bit for display
+set output-meta On
+
+# none, visible or audible
+set bell-style none
+
+# All of the following map the escape sequence of the
+# value contained inside the 1st argument to the
+# readline specific functions
+
+"\eOd": backward-word
+"\eOc": forward-word
+
+# for linux console
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+"\e[5~": beginning-of-history
+"\e[6~": end-of-history
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+
+# for xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line
+
+# for Konsole
+"\e[H": beginning-of-line
+"\e[F": end-of-line
+
 # End /etc/inputrc




More information about the alfs-log mailing list