[Clfs-commits] commit: r3915 - in /trunk/BOOK: boot/alpha/ boot/mips/ boot/mips64/ boot/ppc/ boot/ppc64/ boot/sparc/ boot/sparc64/ boot/x86/ boot/x86_64/ bootable/alpha/ bootable/mips/ bootable/mips64/ bootable/ppc/ bootable/ppc64/ bootable/sparc/ bootable/sparc64-64/ bootable/sparc64/ bootable/x86/ bootable/x86_64-64/ bootable/x86_64/

svn at cross-lfs.org svn at cross-lfs.org
Tue Jun 17 20:22:26 PDT 2008


Author: jciccone
Date: Wed Jun 18 03:22:25 2008
New Revision: 3915

Log:
Change kernel security fixes patch from a1 + a2 to p1 + p2 to avoid a conflift with the alpha page_size patch.

Modified:
    trunk/BOOK/boot/alpha/kernel.xml
    trunk/BOOK/boot/mips/kernel.xml
    trunk/BOOK/boot/mips64/kernel.xml
    trunk/BOOK/boot/ppc/kernel.xml
    trunk/BOOK/boot/ppc64/kernel.xml
    trunk/BOOK/boot/sparc/kernel.xml
    trunk/BOOK/boot/sparc64/kernel.xml
    trunk/BOOK/boot/x86/kernel.xml
    trunk/BOOK/boot/x86_64/kernel.xml
    trunk/BOOK/bootable/alpha/kernel.xml
    trunk/BOOK/bootable/mips/kernel.xml
    trunk/BOOK/bootable/mips64/kernel.xml
    trunk/BOOK/bootable/ppc/kernel.xml
    trunk/BOOK/bootable/ppc64/kernel.xml
    trunk/BOOK/bootable/sparc/kernel.xml
    trunk/BOOK/bootable/sparc64-64/kernel.xml
    trunk/BOOK/bootable/sparc64/kernel.xml
    trunk/BOOK/bootable/x86/kernel.xml
    trunk/BOOK/bootable/x86_64-64/kernel.xml
    trunk/BOOK/bootable/x86_64/kernel.xml

Modified: trunk/BOOK/boot/alpha/kernel.xml
==============================================================================
--- trunk/BOOK/boot/alpha/kernel.xml (original)
+++ trunk/BOOK/boot/alpha/kernel.xml Wed Jun 18 03:22:25 2008
@@ -28,11 +28,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/mips/kernel.xml
==============================================================================
--- trunk/BOOK/boot/mips/kernel.xml (original)
+++ trunk/BOOK/boot/mips/kernel.xml Wed Jun 18 03:22:25 2008
@@ -28,11 +28,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/mips64/kernel.xml
==============================================================================
--- trunk/BOOK/boot/mips64/kernel.xml (original)
+++ trunk/BOOK/boot/mips64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -28,11 +28,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/ppc/kernel.xml
==============================================================================
--- trunk/BOOK/boot/ppc/kernel.xml (original)
+++ trunk/BOOK/boot/ppc/kernel.xml Wed Jun 18 03:22:25 2008
@@ -28,11 +28,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/ppc64/kernel.xml
==============================================================================
--- trunk/BOOK/boot/ppc64/kernel.xml (original)
+++ trunk/BOOK/boot/ppc64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -28,11 +28,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/sparc/kernel.xml
==============================================================================
--- trunk/BOOK/boot/sparc/kernel.xml (original)
+++ trunk/BOOK/boot/sparc/kernel.xml Wed Jun 18 03:22:25 2008
@@ -28,11 +28,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/sparc64/kernel.xml
==============================================================================
--- trunk/BOOK/boot/sparc64/kernel.xml (original)
+++ trunk/BOOK/boot/sparc64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -28,11 +28,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/x86/kernel.xml
==============================================================================
--- trunk/BOOK/boot/x86/kernel.xml (original)
+++ trunk/BOOK/boot/x86/kernel.xml Wed Jun 18 03:22:25 2008
@@ -34,11 +34,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"

Modified: trunk/BOOK/boot/x86_64/kernel.xml
==============================================================================
--- trunk/BOOK/boot/x86_64/kernel.xml (original)
+++ trunk/BOOK/boot/x86_64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -28,11 +28,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/alpha/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/alpha/kernel.xml (original)
+++ trunk/BOOK/bootable/alpha/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/mips/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/mips/kernel.xml (original)
+++ trunk/BOOK/bootable/mips/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/mips64/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/mips64/kernel.xml (original)
+++ trunk/BOOK/bootable/mips64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/ppc/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/ppc/kernel.xml (original)
+++ trunk/BOOK/bootable/ppc/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/ppc64/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/ppc64/kernel.xml (original)
+++ trunk/BOOK/bootable/ppc64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/sparc/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/sparc/kernel.xml (original)
+++ trunk/BOOK/bootable/sparc/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/sparc64-64/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/sparc64-64/kernel.xml (original)
+++ trunk/BOOK/bootable/sparc64-64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/sparc64/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/sparc64/kernel.xml (original)
+++ trunk/BOOK/bootable/sparc64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/x86/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/x86/kernel.xml (original)
+++ trunk/BOOK/bootable/x86/kernel.xml Wed Jun 18 03:22:25 2008
@@ -22,11 +22,11 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
 
-    <para os="a1">A number of vulnerabilities have come to light after the
+    <para os="p1">A number of vulnerabilities have come to light after the
     stable kernel team stopped supporting 2.6.24.  The following patch addresses
     them:</para>
 
-<screen os="a2"><userinput>patch -Np1 -i ../&linux-security-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&linux-security-patch;</userinput></screen>
 
     <para os="a">Building the kernel involves a few steps—configuration,
     compilation, and installation. Read the <filename>README</filename>

Modified: trunk/BOOK/bootable/x86_64-64/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/x86_64-64/kernel.xml (original)
+++ trunk/BOOK/bootable/x86_64-64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/x86_64/kernel.xml
==============================================================================
--- trunk/BOOK/bootable/x86_64/kernel.xml (original)
+++ trunk/BOOK/bootable/x86_64/kernel.xml Wed Jun 18 03:22:25 2008
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"




More information about the Clfs-commits mailing list