Index: BOOK/final-system/alpha/eglibc.xml
===================================================================
--- BOOK/final-system/alpha/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/alpha/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -36,9 +36,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/common/eglibc.xml
===================================================================
--- BOOK/final-system/common/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/common/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -43,8 +43,8 @@
 <screen os="p2"><userinput>patch -Np1 -i ../&eglibc-fixes-patch;</userinput></screen>
 
-    <para os="l1">The following sed makes sure that newly built EGLIBC is tested,
+    <para os="l3">The following sed makes sure that newly built EGLIBC is tested,
     during make install, instead of the one we previously build:</para>
 
-<screen os="l2"><userinput>LINKER=$(readelf -l $(file /tools/lib/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
+<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
 sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
   scripts/test-installation.pl
Index: BOOK/final-system/mips/eglibc.xml
===================================================================
--- BOOK/final-system/mips/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/mips/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -36,9 +36,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64-64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64-64/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/mips64-64/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -36,9 +36,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-64bit.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/mips64/eglibc-64bit.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -32,9 +32,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/eglibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/eglibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-n32.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/mips64/eglibc-n32.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -32,7 +32,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
-<screen os="l2"><userinput>LINKER=$(readelf -l $(file /tools/lib32/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
+<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib32/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
 sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
   scripts/test-installation.pl
Index: BOOK/final-system/mips64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/mips64/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -37,9 +37,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eglibc-64bit.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/multilib/eglibc-64bit.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -32,7 +32,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
-<screen os="l2"><userinput>LINKER=$(readelf -l $(file /tools/lib64/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
+<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib64/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
 sed -i "s|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=${LINKER} -o|" \
   scripts/test-installation.pl
Index: BOOK/final-system/multilib/eglibc.xml
===================================================================
--- BOOK/final-system/multilib/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/multilib/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -37,9 +37,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc/eglibc.xml
===================================================================
--- BOOK/final-system/ppc/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/ppc/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -36,9 +36,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc-64bit.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/ppc64/eglibc-64bit.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -32,9 +32,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/eglibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/ppc64/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -37,9 +37,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/sparc64-64/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -36,9 +36,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/eglibc-64bit.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/sparc64/eglibc-64bit.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -32,9 +32,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/eglibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86/eglibc.xml
===================================================================
--- BOOK/final-system/x86/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/x86/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -36,9 +36,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64-64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/x86_64-64/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -36,9 +36,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc-64bit.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/x86_64/eglibc-64bit.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -32,9 +32,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/eglibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc.xml	(revision 2026a2eb755a8bd8aa1d8aa4534c5892befe2a48)
+++ BOOK/final-system/x86_64/eglibc.xml	(revision c0bc7c48fb84ab9c0985bf1aaa09cea8c21079b3)
@@ -37,9 +37,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
