Changeset cbd8bf0f

Timestamp:

05/27/2016 03:38:29 AM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 7.10, 7.10-rc1, 8.0, 8.0-rc1, 8.1, 8.1-rc1, 8.1-rc2, 8.2, 8.2-rc1, 8.3, 8.3-rc1, 8.3-rc2, 8.4, 8.4-rc1, 9.0, 9.0-rc1, 9.1, 9.1-rc1, arm, bdubbs/gcc13, cross-chap5, ml-11.0, multilib, nosym, old-trunk, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/git-transition, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

e787b1f

Parents:

35a5259

Message:

Updates after a successful jhalfs build

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/merge@11077 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• Makefile (modified) (1 diff)
• chapter06/chapter06.xml (modified) (4 diffs)
• chapter06/createfiles.xml (modified) (1 diff)

Makefile

@@ -189 +189 @@
 dump-commands: validate
         @echo "Dumping book commands..."
-        $(Q)xsltproc --nonet                     \
-      --output $(RENDERTMP)/lfs-html.xml    \
-      --stringparam profile.revision $(REV) \
-      stylesheets/lfs-xsl/profile.xsl       \
-      $(RENDERTMP)/lfs-full.xml
+#       $(Q)xsltproc --nonet                     \
+#      --output $(RENDERTMP)/lfs-html.xml    \
+#      --stringparam profile.revision $(REV) \
+#      stylesheets/lfs-xsl/profile.xsl       \
+#      $(RENDERTMP)/lfs-full.xml
 
         $(Q)rm -rf $(DUMPDIR)

chapter06/chapter06.xml

@@ -40 +40 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
@@ -52 +51 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
@@ -67 +62 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
 
   <!-- systemd only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
@@ -91 +87 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>

chapter06/createfiles.xml

@@ -155 +155 @@
 EOF</userinput></screen>
 
-<screen revision="systmed"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
+<screen revision="systemd"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
 <literal>root:x:0:0:root:/root:/bin/bash
 bin:x:1:1:bin:/dev/null:/bin/false